diff options
| author | Paul Moore <paul.moore@hp.com> | 2008-01-22 09:31:00 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-01-22 09:31:00 +1100 |
| commit | 45c950e0f839fded922ebc0bfd59b1081cc71b70 (patch) | |
| tree | 97ca2840c63c0c646daf6b13420157237a3fcbec /security | |
| parent | a7da60f41551abb3c520b03d42ec05dd7decfc7f (diff) | |
| download | linux-3.10-45c950e0f839fded922ebc0bfd59b1081cc71b70.tar.gz linux-3.10-45c950e0f839fded922ebc0bfd59b1081cc71b70.tar.bz2 linux-3.10-45c950e0f839fded922ebc0bfd59b1081cc71b70.zip | |
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')
| -rw-r--r-- | security/selinux/netlabel.c | 7 | ||||
| -rw-r--r-- | security/selinux/ss/services.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c index d243ddc723a..66e013d6f6f 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) struct sk_security_struct *sksec = sk->sk_security; struct netlbl_lsm_secattr secattr; + netlbl_secattr_init(&secattr); + rc = security_netlbl_sid_to_secattr(sid, &secattr); if (rc != 0) - return rc; - + goto sock_setsid_return; rc = netlbl_sock_setattr(sk, &secattr); if (rc == 0) { spin_lock_bh(&sksec->nlbl_lock); @@ -64,6 +65,8 @@ static int selinux_netlbl_sock_setsid(struct sock *sk, u32 sid) spin_unlock_bh(&sksec->nlbl_lock); } +sock_setsid_return: + netlbl_secattr_destroy(&secattr); return rc; } diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index d572dc908f3..f83b19daed1 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -2606,8 +2606,6 @@ int security_netlbl_sid_to_secattr(u32 sid, struct netlbl_lsm_secattr *secattr) int rc = -ENOENT; struct context *ctx; - netlbl_secattr_init(secattr); - if (!ss_initialized) return 0; |