summaryrefslogtreecommitdiffstats
path: root/net/netlink
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-11-24 02:34:03 +0100
committerDavid S. Miller <davem@davemloft.net>2008-11-24 02:34:03 +0100
commit6f756a8c36bf54d0afb1d457082b3e3033d951a7 (patch)
tree33efc99e3df9edf1d777a00913852d24d19b930b /net/netlink
parentnet: fix tunnels in netns after ndo_ changes (diff)
downloadlinux-6f756a8c36bf54d0afb1d457082b3e3033d951a7.tar.xz
linux-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/netlink')
-rw-r--r--net/netlink/af_netlink.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index a2071dcfe9e8..c7d76579bf3c 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -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: