Commit 35f9c09fe (tcp: tcp_sendpages() should call tcp_push() once)
added an internal flag MSG_SENDPAGE_NOTLAST.
We have to ensure that MSG_MORE is also set if we set MSG_SENDPAGE_NOTLAST.
Otherwise users that check against MSG_MORE will not see it.
This fixes sendfile() on AF_ALG.
Cc: Tom Herbert <therb...@google.com>
Cc: Eric Dumazet <eric.duma...@gmail.com>
Cc: David S. Miller <da...@davemloft.net>
Cc: <sta...@vger.kernel.org> # 3.4.x
Reported-and-tested-by: Shawn Landden <shawnland...@gmail.com>
Signed-off-by: Richard Weinberger <rich...@nod.at>
---
fs/splice.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/splice.c b/fs/splice.c
index 3b7ee65..b93f1b8 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -701,7 +701,7 @@ static int pipe_to_sendpage(struct pipe_inode_info *pipe,
more = (sd->flags & SPLICE_F_MORE) ? MSG_MORE : 0;
if (sd->len < sd->total_len && pipe->nrbufs > 1)
- more |= MSG_SENDPAGE_NOTLAST;
+ more |= MSG_SENDPAGE_NOTLAST | MSG_MORE;
return file->f_op->sendpage(file, buf->page, buf->offset,
sd->len, &pos, more);
--
1.8.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
