aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/algif_skcipher.c
diff options
context:
space:
mode:
authorLinus Walleij <[email protected]>2013-12-09 13:04:37 +0000
committerLinus Walleij <[email protected]>2013-12-09 13:04:37 +0000
commitbdc54ef45d7670aeb52ce73f8b7ad5f3e5563661 (patch)
treeda6e170ce87891a0242de88d8d7c1ba34faf9bb7 /crypto/algif_skcipher.c
parentMerge branch 'mark-irqs' into devel (diff)
parentLinux 3.13-rc3 (diff)
downloadkernel-bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661.tar.gz
kernel-bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661.zip
Merge tag 'v3.13-rc3' into devel
Linux 3.13-rc3
Diffstat (limited to 'crypto/algif_skcipher.c')
-rw-r--r--crypto/algif_skcipher.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index 6a6dfc062d2a..a19c027b29bd 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -378,6 +378,9 @@ static ssize_t skcipher_sendpage(struct socket *sock, struct page *page,
struct skcipher_sg_list *sgl;
int err = -EINVAL;
+ if (flags & MSG_SENDPAGE_NOTLAST)
+ flags |= MSG_MORE;
+
lock_sock(sk);
if (!ctx->more && ctx->used)
goto unlock;