diff --git a/[refs] b/[refs] index 725b9ae84ab1..4b1bdc8b8a65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86112ffdccab3ee75bc9d9dfae6745df73189e37 +refs/heads/master: 797951200679f1d5ea12a2e58cc7bdbc2848764c diff --git a/trunk/security/selinux/ss/services.c b/trunk/security/selinux/ss/services.c index 372eaade3ca6..3eb1fa9f0de1 100644 --- a/trunk/security/selinux/ss/services.c +++ b/trunk/security/selinux/ss/services.c @@ -2491,9 +2491,9 @@ static int selinux_netlbl_socket_setsid(struct socket *sock, u32 sid) rc = netlbl_socket_setattr(sock, &secattr); if (rc == 0) { - spin_lock(&sksec->nlbl_lock); + spin_lock_bh(&sksec->nlbl_lock); sksec->nlbl_state = NLBL_LABELED; - spin_unlock(&sksec->nlbl_lock); + spin_unlock_bh(&sksec->nlbl_lock); } netlbl_socket_setsid_return: