| Message ID | 20150116062348.GA8588@gondor.apana.org.au |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 01/16/2015 02:23 PM, Herbert Xu wrote: > The patch c5adde9468b0714a051eac7f9666f23eb10b61f7 ("netlink: > eliminate nl_sk_hash_lock") introduced a bug where the EADDRINUSE > error has been replaced by ENOMEM. This patch rectifies that > problem. > Nice catch! Acked-by: Ying Xue <ying.xue@windriver.com> > Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> > > diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c > index 01b702d..7a94185 100644 > --- a/net/netlink/af_netlink.c > +++ b/net/netlink/af_netlink.c > @@ -1050,7 +1050,7 @@ netlink_update_listeners(struct sock *sk) > static int netlink_insert(struct sock *sk, struct net *net, u32 portid) > { > struct netlink_table *table = &nl_table[sk->sk_protocol]; > - int err = -EADDRINUSE; > + int err; > > lock_sock(sk); > > @@ -1065,10 +1065,13 @@ static int netlink_insert(struct sock *sk, struct net *net, u32 portid) > > nlk_sk(sk)->portid = portid; > sock_hold(sk); > - if (__netlink_insert(table, sk, net)) > - err = 0; > - else > + > + err = 0; > + if (!__netlink_insert(table, sk, net)) { > + err = -EADDRINUSE; > sock_put(sk); > + } > + > err: > release_sock(sk); > return err; > -- 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
From: Herbert Xu <herbert@gondor.apana.org.au> Date: Fri, 16 Jan 2015 17:23:48 +1100 > The patch c5adde9468b0714a051eac7f9666f23eb10b61f7 ("netlink: > eliminate nl_sk_hash_lock") introduced a bug where the EADDRINUSE > error has been replaced by ENOMEM. This patch rectifies that > problem. > > Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Applied, thanks Herbert. -- 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/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 01b702d..7a94185 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -1050,7 +1050,7 @@ netlink_update_listeners(struct sock *sk) static int netlink_insert(struct sock *sk, struct net *net, u32 portid) { struct netlink_table *table = &nl_table[sk->sk_protocol]; - int err = -EADDRINUSE; + int err; lock_sock(sk); @@ -1065,10 +1065,13 @@ static int netlink_insert(struct sock *sk, struct net *net, u32 portid) nlk_sk(sk)->portid = portid; sock_hold(sk); - if (__netlink_insert(table, sk, net)) - err = 0; - else + + err = 0; + if (!__netlink_insert(table, sk, net)) { + err = -EADDRINUSE; sock_put(sk); + } + err: release_sock(sk); return err;
The patch c5adde9468b0714a051eac7f9666f23eb10b61f7 ("netlink: eliminate nl_sk_hash_lock") introduced a bug where the EADDRINUSE error has been replaced by ENOMEM. This patch rectifies that problem. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>