diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-05 10:15:16 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-05 10:15:16 +0000 |
commit | dffe2a3eed105c631500778dfaba0998d7bf8512 (patch) | |
tree | 4c2492d710e0b101f57a7f399b3e891129b1c8b4 /security | |
parent | 3b21b35761de8348dd2f7cff9752449281d7a17b (diff) | |
parent | 538069756ce13f9d0e0ccb7a17b6935a0bfb7cad (diff) |
Merge tag 'v3.10.22' into linux-linaro-lsk
This is the 3.10.22 stable release
Diffstat (limited to 'security')
-rw-r--r-- | security/selinux/netlabel.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c index da4b8b23328..6235d052338 100644 --- a/security/selinux/netlabel.c +++ b/security/selinux/netlabel.c @@ -442,8 +442,7 @@ int selinux_netlbl_socket_connect(struct sock *sk, struct sockaddr *addr) sksec->nlbl_state != NLBL_CONNLABELED) return 0; - local_bh_disable(); - bh_lock_sock_nested(sk); + lock_sock(sk); /* connected sockets are allowed to disconnect when the address family * is set to AF_UNSPEC, if that is what is happening we want to reset @@ -464,7 +463,6 @@ int selinux_netlbl_socket_connect(struct sock *sk, struct sockaddr *addr) sksec->nlbl_state = NLBL_CONNLABELED; socket_connect_return: - bh_unlock_sock(sk); - local_bh_enable(); + release_sock(sk); return rc; } |