Re: Patch "net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST" has been added to the 3.10-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, Dec 8, 2013 at 9:17 PM,  <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> This is a note to let you know that I've just added the patch titled
>
>     net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST
>
> to the 3.10-stable tree which can be found at:
>     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>
> The filename of the patch is:
>      net-update-consumers-of-msg_more-to-recognize-msg_sendpage_notlast.patch
> and it can be found in the queue-3.10 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@xxxxxxxxxxxxxxx> know about it.

Hi,

I think this patch should be reverted, as it was already applied once.

Also, how it could possibly make it to stable, with these changes and the same
sha?

Thank you!

>
>
> From d3f7d56a7a4671d395e8af87071068a195257bf6 Mon Sep 17 00:00:00 2001
> From: Shawn Landden <shawn@xxxxxxxxxxxxxxx>
> 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@xxxxxxxxxxxxxxx>
>
> 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@xxxxxxxxxx>
> Cc: Eric Dumazet <eric.dumazet@xxxxxxxxx>
> Cc: David S. Miller <davem@xxxxxxxxxxxxx>
> Reported-and-tested-by: Shawn Landden <shawnlandden@xxxxxxxxx>
> Original-patch: Richard Weinberger <richard@xxxxxx>
> Signed-off-by: Shawn Landden <shawn@xxxxxxxxxxxxxxx>
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
>
> ---
>  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
> @@ -117,6 +117,9 @@ static ssize_t hash_sendpage(struct sock
>         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);
> --- a/crypto/algif_skcipher.c
> +++ b/crypto/algif_skcipher.c
> @@ -381,6 +381,9 @@ static ssize_t skcipher_sendpage(struct
>         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;
> --- a/net/ipv4/udp.c
> +++ b/net/ipv4/udp.c
> @@ -1073,6 +1073,9 @@ int udp_sendpage(struct sock *sk, struct
>         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 };
>
>
>
> Patches currently in stable-queue which might be from shawn@xxxxxxxxxxxxxxx are
>
> queue-3.10/net-update-consumers-of-msg_more-to-recognize-msg_sendpage_notlast.patch
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
Best regards,
Veaceslav Falico
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]