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:
parent
57699a40b4
commit
919d9db952
|
@ -1050,7 +1050,7 @@ netlink_update_listeners(struct sock *sk)
|
||||||
static int netlink_insert(struct sock *sk, struct net *net, u32 portid)
|
static int netlink_insert(struct sock *sk, struct net *net, u32 portid)
|
||||||
{
|
{
|
||||||
struct netlink_table *table = &nl_table[sk->sk_protocol];
|
struct netlink_table *table = &nl_table[sk->sk_protocol];
|
||||||
int err = -EADDRINUSE;
|
int err;
|
||||||
|
|
||||||
lock_sock(sk);
|
lock_sock(sk);
|
||||||
|
|
||||||
|
@ -1065,10 +1065,13 @@ static int netlink_insert(struct sock *sk, struct net *net, u32 portid)
|
||||||
|
|
||||||
nlk_sk(sk)->portid = portid;
|
nlk_sk(sk)->portid = portid;
|
||||||
sock_hold(sk);
|
sock_hold(sk);
|
||||||
if (__netlink_insert(table, sk, net))
|
|
||||||
err = 0;
|
err = 0;
|
||||||
else
|
if (!__netlink_insert(table, sk, net)) {
|
||||||
|
err = -EADDRINUSE;
|
||||||
sock_put(sk);
|
sock_put(sk);
|
||||||
|
}
|
||||||
|
|
||||||
err:
|
err:
|
||||||
release_sock(sk);
|
release_sock(sk);
|
||||||
return err;
|
return err;
|
||||||
|
|
Loading…
Reference in a new issue