netdev - Re: [PATCH net-next] sock: propagate __sock_cmsg

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CACSApvYkBLVygKEDqcMFnFizTi9XNcCt21Z8TMPfipb5JdV=-Q@mail.gmail.com>
Date:	Fri, 13 May 2016 09:29:44 -0400
From:	Soheil Hassas Yeganeh <soheil@...gle.com>
To:	Eric Dumazet <eric.dumazet@...il.com>
Cc:	Soheil Hassas Yeganeh <soheil.kdev@...il.com>,
	David Miller <davem@...emloft.net>,
	netdev <netdev@...r.kernel.org>,
	Eric Dumazet <edumazet@...gle.com>,
	Maciej Żenczykowski <maze@...gle.com>,
	Willem de Bruijn <willemb@...gle.com>
Subject: Re: [PATCH net-next] sock: propagate __sock_cmsg_send() error

On Fri, May 13, 2016 at 9:14 AM, Eric Dumazet <eric.dumazet@...il.com> wrote:
> From: Eric Dumazet <edumazet@...gle.com>
>
> __sock_cmsg_send() might return different error codes, not only -EINVAL.
>
> Fixes: 24025c465f77 ("ipv4: process socket-level control messages in IPv4")
> Fixes: ad1e46a83716 ("ipv6: process socket-level control messages in IPv6")
> Signed-off-by: Eric Dumazet <edumazet@...gle.com>
> Cc: Soheil Hassas Yeganeh <soheil@...gle.com>
Acked-by: Soheil Hassas Yeganeh <soheil@...gle.com>
> ---
>  net/ipv4/ip_sockglue.c |    5 +++--
>  net/ipv6/datagram.c    |    5 +++--
>  2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
> index 5805762d7fc79a702f1d67e802992b822f66f000..71a52f4d4cffba2db9353f43dc817689bf4fab10 100644
> --- a/net/ipv4/ip_sockglue.c
> +++ b/net/ipv4/ip_sockglue.c
> @@ -247,8 +247,9 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc,
>                 }
>  #endif
>                 if (cmsg->cmsg_level == SOL_SOCKET) {
> -                       if (__sock_cmsg_send(sk, msg, cmsg, &ipc->sockc))
> -                               return -EINVAL;
> +                       err = __sock_cmsg_send(sk, msg, cmsg, &ipc->sockc);
> +                       if (err)
> +                               return err;
>                         continue;
>                 }
>
> diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
> index 00d0c2903173a96571983216f2839a93059cad22..37874e2f30edf98f31e2a5097761143d507d5b95 100644
> --- a/net/ipv6/datagram.c
> +++ b/net/ipv6/datagram.c
> @@ -746,8 +746,9 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk,
>                 }
>
>                 if (cmsg->cmsg_level == SOL_SOCKET) {
> -                       if (__sock_cmsg_send(sk, msg, cmsg, sockc))
> -                               return -EINVAL;
> +                       err = __sock_cmsg_send(sk, msg, cmsg, sockc);
> +                       if (err)
> +                               return err;
>                         continue;
>                 }
>
>
>

Thanks Eric for the fixes.