| Message ID | 1385336527-27304-1-git-send-email-richard@nod.at |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sun, Nov 24, 2013 at 3:42 PM, Richard Weinberger <richard@nod.at> wrote: > 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 <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 The offending commit also got backported to the 3.2 stable kernel, so we need this fix there as well. --- Shawn Landden +1 360 389 3001 (SMS preferred) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);
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 <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 Reported-and-tested-by: Shawn Landden <shawnlandden@gmail.com> Signed-off-by: Richard Weinberger <richard@nod.at> --- fs/splice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)