summaryrefslogtreecommitdiff
path: root/net/unix
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-11-23 17:34:03 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-23 17:34:03 -0800
commit6f756a8c36bf54d0afb1d457082b3e3033d951a7 (patch)
tree33efc99e3df9edf1d777a00913852d24d19b930b /net/unix
parentbe77e5930725c3e77bcc0fb1def28e016080d0a1 (diff)
downloadlinux-3.10-6f756a8c36bf54d0afb1d457082b3e3033d951a7.tar.gz
linux-3.10-6f756a8c36bf54d0afb1d457082b3e3033d951a7.tar.bz2
linux-3.10-6f756a8c36bf54d0afb1d457082b3e3033d951a7.zip
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>
Diffstat (limited to 'net/unix')
-rw-r--r--net/unix/af_unix.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index e1ca8f744ca..a45a9f7369e 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -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));