| From e0960eb977786c2fe216d4f779e086cd347bf81d Mon Sep 17 00:00:00 2001 |
| From: Shawn Landden <shawn@churchofgit.com> |
| Date: Sun, 24 Nov 2013 22:36:28 -0800 |
| Subject: net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST |
| |
| From: Shawn Landden <shawn@churchofgit.com> |
| |
| [ Upstream commit d3f7d56a7a4671d395e8af87071068a195257bf6 ] |
| |
| 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 |
| |
| Reported-and-tested-by: Shawn Landden <shawnlandden@gmail.com> |
| Cc: Tom Herbert <therbert@google.com> |
| Cc: Eric Dumazet <eric.dumazet@gmail.com> |
| Cc: David S. Miller <davem@davemloft.net> |
| 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> |
| --- |
| crypto/algif_hash.c | 3 +++ |
| crypto/algif_skcipher.c | 3 +++ |
| net/ipv4/udp.c | 3 +++ |
| 3 files changed, 9 insertions(+) |
| |
| --- a/crypto/algif_hash.c |
| +++ b/crypto/algif_hash.c |
| @@ -114,6 +114,9 @@ static ssize_t hash_sendpage(struct sock |
| struct hash_ctx *ctx = ask->private; |
| int err; |
| |
| + 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); |
| --- a/crypto/algif_skcipher.c |
| +++ b/crypto/algif_skcipher.c |
| @@ -378,6 +378,9 @@ static ssize_t skcipher_sendpage(struct |
| 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; |
| --- a/net/ipv4/udp.c |
| +++ b/net/ipv4/udp.c |
| @@ -1070,6 +1070,9 @@ int udp_sendpage(struct sock *sk, struct |
| struct udp_sock *up = udp_sk(sk); |
| int ret; |
| |
| + if (flags & MSG_SENDPAGE_NOTLAST) |
| + flags |= MSG_MORE; |
| + |
| if (!up->pending) { |
| struct msghdr msg = { .msg_flags = flags|MSG_MORE }; |
| |