diff options
author | Paul Moore <paul.moore@hp.com> | 2008-01-21 17:31:00 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-01-21 17:31:00 -0500 |
commit | 45c950e0f839fded922ebc0bfd59b1081cc71b70 (patch) | |
tree | 97ca2840c63c0c646daf6b13420157237a3fcbec /security/selinux/netlabel.c | |
parent | a7da60f41551abb3c520b03d42ec05dd7decfc7f (diff) |
selinux: fix memory leak in netlabel code
Fix a memory leak in security_netlbl_sid_to_secattr() as reported here:
* https://bugzilla.redhat.com/show_bug.cgi?id=352281
Signed-off-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux/netlabel.c')
-rw-r--r-- | security/selinux/netlabel.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c index d243ddc723a5..66e013d6f6f6 100644 --- a/security/selinux/netlabel.c +++ b/security/selinux/netlabel.c | |||
@@ -53,10 +53,11 @@ static int selinux_netlbl_sock_setsid(struct sock *sk, u32 sid) | |||
53 | struct sk_security_struct *sksec = sk->sk_security; | 53 | struct sk_security_struct *sksec = sk->sk_security; |
54 | struct netlbl_lsm_secattr secattr; | 54 | struct netlbl_lsm_secattr secattr; |
55 | 55 | ||
56 | netlbl_secattr_init(&secattr); | ||
57 | |||
56 | rc = security_netlbl_sid_to_secattr(sid, &secattr); | 58 | rc = security_netlbl_sid_to_secattr(sid, &secattr); |
57 | if (rc != 0) | 59 | if (rc != 0) |
58 | return rc; | 60 | goto sock_setsid_return; |
59 | |||
60 | rc = netlbl_sock_setattr(sk, &secattr); | 61 | rc = netlbl_sock_setattr(sk, &secattr); |
61 | if (rc == 0) { | 62 | if (rc == 0) { |
62 | spin_lock_bh(&sksec->nlbl_lock); | 63 | spin_lock_bh(&sksec->nlbl_lock); |
@@ -64,6 +65,8 @@ static int selinux_netlbl_sock_setsid(struct sock *sk, u32 sid) | |||
64 | spin_unlock_bh(&sksec->nlbl_lock); | 65 | spin_unlock_bh(&sksec->nlbl_lock); |
65 | } | 66 | } |
66 | 67 | ||
68 | sock_setsid_return: | ||
69 | netlbl_secattr_destroy(&secattr); | ||
67 | return rc; | 70 | return rc; |
68 | } | 71 | } |
69 | 72 | ||