diff options
| author | Shawn Landden <shawn@churchofgit.com> | 2013-11-24 22:36:28 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-11 22:34:11 -0800 |
| commit | 30f2ae6300af96eab5c42726557442df96a40fe7 (patch) | |
| tree | 1d1196e4fd5c3db37354e0d0717e51ec0e83888d | |
| parent | a8000959881be86ee8e5262d305f12accb68db70 (diff) | |
net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST
commit d3f7d56a7a4671d395e8af87071068a195257bf6 upstream.
Commit 35f9c09fe (tcp: tcp_sendpages() should call tcp_push() once)
added an internal flag MSG_SENDPAGE_NOTLAST, similar to
MSG_MORE.
algif_hash, algif_skcipher, and udp used MSG_MORE from tcp_sendpages()
and need to see the new flag as identical to MSG_MORE.
This fixes sendfile() on AF_ALG.
v3: also fix udp
Cc: Tom Herbert <therbert@google.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Reported-and-tested-by: Shawn Landden <shawnlandden@gmail.com>
Original-patch: Richard Weinberger <richard@nod.at>
Signed-off-by: Shawn Landden <shawn@churchofgit.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | crypto/algif_hash.c | 3 | ||||
| -rw-r--r-- | crypto/algif_skcipher.c | 3 | ||||
| -rw-r--r-- | net/ipv4/udp.c | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index 850246206b12..585c3b279feb 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -117,6 +117,9 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page, if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE; + if (flags & MSG_SENDPAGE_NOTLAST) + flags |= MSG_MORE; + lock_sock(sk); sg_init_table(ctx->sgl.sg, 1); sg_set_page(ctx->sgl.sg, page, size, offset); diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index a19c027b29bd..918a3b4148b8 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -381,6 +381,9 @@ static ssize_t skcipher_sendpage(struct socket *sock, struct page *page, if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE; + if (flags & MSG_SENDPAGE_NOTLAST) + flags |= MSG_MORE; + lock_sock(sk); if (!ctx->more && ctx->used) goto unlock; diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 7949b5d1663f..19e784237f7a 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1042,6 +1042,9 @@ int udp_sendpage(struct sock *sk, struct page *page, int offset, if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE; + if (flags & MSG_SENDPAGE_NOTLAST) + flags |= MSG_MORE; + if (!up->pending) { struct msghdr msg = { .msg_flags = flags|MSG_MORE }; |