p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

netlink: Fix netlink_insert EADDRINUSE error 

The patch c5adde9468 ("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>
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu 2015-01-16 17:23:48 +11:00 committed by David S. Miller
parent 57699a40b4
commit 919d9db952
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/netlink/af_netlink.c
View File

@ -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;