diff options
| author | Paul Moore <paul.moore@hp.com> | 2007-01-05 15:08:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-01-09 03:30:00 -0500 |
| commit | 797951200679f1d5ea12a2e58cc7bdbc2848764c (patch) | |
| tree | aaf0785e317ad5f4651324669bcafbd163d1833d /security | |
| parent | 86112ffdccab3ee75bc9d9dfae6745df73189e37 (diff) | |
NetLabel: correct locking in selinux_netlbl_socket_setsid()
The spinlock protecting the update of the "sksec->nlbl_state" variable is not
currently softirq safe which can lead to problems. This patch fixes this by
changing the spin_{un}lock() functions into spin_{un}lock_bh() functions.
Signed-off-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/ss/services.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 372eaade3ca6..3eb1fa9f0de1 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
| @@ -2491,9 +2491,9 @@ static int selinux_netlbl_socket_setsid(struct socket *sock, u32 sid) | |||
| 2491 | 2491 | ||
| 2492 | rc = netlbl_socket_setattr(sock, &secattr); | 2492 | rc = netlbl_socket_setattr(sock, &secattr); |
| 2493 | if (rc == 0) { | 2493 | if (rc == 0) { |
| 2494 | spin_lock(&sksec->nlbl_lock); | 2494 | spin_lock_bh(&sksec->nlbl_lock); |
| 2495 | sksec->nlbl_state = NLBL_LABELED; | 2495 | sksec->nlbl_state = NLBL_LABELED; |
| 2496 | spin_unlock(&sksec->nlbl_lock); | 2496 | spin_unlock_bh(&sksec->nlbl_lock); |
| 2497 | } | 2497 | } |
| 2498 | 2498 | ||
| 2499 | netlbl_socket_setsid_return: | 2499 | netlbl_socket_setsid_return: |