aboutsummaryrefslogtreecommitdiffstats
path: root/net/netlink
diff options
context:
space:
mode:
authorEric Dumazet <dada1@cosmosbay.com>2008-11-24 14:05:22 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-24 14:05:22 -0800
commit3755810cebf7f9902b05c7ba9baeac0fc44881be (patch)
treee4bee0e33103781034fdf6144898a67b21778ad7 /net/netlink
parent920de804bca61f88643bc9171bcd06f1a56c6258 (diff)
downloadkernel_samsung_crespo-3755810cebf7f9902b05c7ba9baeac0fc44881be.zip
kernel_samsung_crespo-3755810cebf7f9902b05c7ba9baeac0fc44881be.tar.gz
kernel_samsung_crespo-3755810cebf7f9902b05c7ba9baeac0fc44881be.tar.bz2
net: Make sure BHs are disabled in sock_prot_inuse_add()
There is still a call to sock_prot_inuse_add() in af_netlink while in a preemptable section. Add explicit BH disable around this call. Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
-rw-r--r--net/netlink/af_netlink.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index c7d7657..9eb895c 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -515,7 +515,9 @@ static int netlink_release(struct socket *sock)
kfree(nlk->groups);
nlk->groups = NULL;
+ local_bh_disable();
sock_prot_inuse_add(sock_net(sk), &netlink_proto, -1);
+ local_bh_enable();
sock_put(sk);
return 0;
}