X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=crypto%2Falgif_skcipher.c;h=a19c027b29bde504ac8eae4b4572947a69ed2335;hb=a80ffa191b093129e184c7e06ef718a3937f2075;hp=a1c4f0a555832089129eb77be3680aea03856148;hpb=49a34fd5380d249ae8a2173399c62fc5a1fddd70;p=~andy%2Flinux

diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index a1c4f0a5558..a19c027b29b 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;
@@ -432,7 +435,6 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
 	long copied = 0;
 
 	lock_sock(sk);
-	msg->msg_namelen = 0;
 	for (iov = msg->msg_iov, iovlen = msg->msg_iovlen; iovlen > 0;
 	     iovlen--, iov++) {
 		unsigned long seglen = iov->iov_len;