diff options
author | Shawn Landden <shawn@churchofgit.com> | 2013-11-24 22:36:28 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-11-29 16:32:54 -0500 |
commit | 507060a49ed0f966d25e27291c2bbe2b8ed95df6 (patch) | |
tree | ffc25fdda6dccf09f073bf7d35962df419e87807 /crypto/algif_hash.c | |
parent | e796b2ce4ced6065e639c420f28c9df9b1d7f4d0 (diff) | |
download | linux-crypto-507060a49ed0f966d25e27291c2bbe2b8ed95df6.tar.gz linux-crypto-507060a49ed0f966d25e27291c2bbe2b8ed95df6.zip |
net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST
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>
Cc: <stable@vger.kernel.org> # 3.4.x + 3.2.x
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>
Diffstat (limited to '')
-rw-r--r-- | crypto/algif_hash.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index ef5356cd..85024620 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -114,6 +114,9 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page, 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); |