mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
net: Make sure BHs are disabled in sock_prot_inuse_add()
The rule of calling sock_prot_inuse_add() is that BHs must be disabled. Some new calls were added where this was not true and this tiggers warnings as reported by Ilpo. Fix this by adding explicit BH disabling around those call sites. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
be77e59307
commit
6f756a8c36
3 changed files with 9 additions and 0 deletions
|
@ -452,7 +452,10 @@ static int netlink_create(struct net *net, struct socket *sock, int protocol)
|
|||
if (err < 0)
|
||||
goto out_module;
|
||||
|
||||
local_bh_disable();
|
||||
sock_prot_inuse_add(net, &netlink_proto, 1);
|
||||
local_bh_enable();
|
||||
|
||||
nlk = nlk_sk(sock->sk);
|
||||
nlk->module = module;
|
||||
out:
|
||||
|
|
|
@ -3614,7 +3614,11 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk)
|
|||
|
||||
SCTP_DBG_OBJCNT_INC(sock);
|
||||
atomic_inc(&sctp_sockets_allocated);
|
||||
|
||||
local_bh_disable();
|
||||
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
|
||||
local_bh_enable();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -361,7 +361,9 @@ static void unix_sock_destructor(struct sock *sk)
|
|||
unix_release_addr(u->addr);
|
||||
|
||||
atomic_dec(&unix_nr_socks);
|
||||
local_bh_disable();
|
||||
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
|
||||
local_bh_enable();
|
||||
#ifdef UNIX_REFCNT_DEBUG
|
||||
printk(KERN_DEBUG "UNIX %p is destroyed, %d are still alive.\n", sk,
|
||||
atomic_read(&unix_nr_socks));
|
||||
|
|
Loading…
Reference in a new issue