[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20151208.112148.848925272627144797.davem@davemloft.net>
Date: Tue, 08 Dec 2015 11:21:48 -0500 (EST)
From: David Miller <davem@...emloft.net>
To: herbert@...dor.apana.org.au
Cc: s.priebe@...fihost.ag, hannes@...essinduktion.org,
fweimer@...hat.com, tglx@...utronix.de, netdev@...r.kernel.org,
linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org,
j.winkel@...fihost.ag, m.schinkel@...fihost.ag,
stable@...r.kernel.org
Subject: Re: netlink: Add missing goto statement to netlink_insert
From: Herbert Xu <herbert@...dor.apana.org.au>
Date: Tue, 8 Dec 2015 14:13:19 +0800
> On Mon, Dec 07, 2015 at 07:58:25AM +0100, Stefan Priebe - Profihost AG wrote:
>>
>> Thanks, good. Can you help me to get this fix upstream into the stable
>> lines?
>
> Sure. Greg, please apply this patch to fix up the backport for 4.1.
Herbert, thanks so much for taking care of this.
> ---8<---
> The backport of 1f770c0a09da855a2b51af6d19de97fb955eca85 ("netlink:
> Fix autobind race condition that leads to zero port ID") missed a
> goto statement, which causes netlink to break subtly.
>
> This was discovered by Stefan Priebe <s.priebe@...fihost.ag>.
>
> Fixes: 4e2776241766 ("netlink: Fix autobind race condition that...")
> Reported-by: Stefan Priebe <s.priebe@...fihost.ag>
> Reported-by: Philipp Hahn <pmhahn@...ahn.de>
> Signed-off-by: Herbert Xu <herbert@...dor.apana.org.au>
Acked-by: David S. Miller <davem@...emloft.net>
>
> diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
> index d139c43..0d6038c 100644
> --- a/net/netlink/af_netlink.c
> +++ b/net/netlink/af_netlink.c
> @@ -1118,6 +1118,7 @@ static int netlink_insert(struct sock *sk, u32 portid)
> if (err == -EEXIST)
> err = -EADDRINUSE;
> sock_put(sk);
> + goto err;
> }
>
> /* We need to ensure that the socket is hashed and visible. */
>
> --
> Email: Herbert Xu <herbert@...dor.apana.org.au>
> Home Page: http://gondor.apana.org.au/~herbert/
> PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists