aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux
diff options
context:
space:
mode:
authorPaul Moore <paul.moore@hp.com>2008-01-28 22:49:00 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-31 22:27:04 -0500
commite1770d97a730ff4c3aa1775d98f4d0558390607f (patch)
tree64ad3c2d24b5506861aac9cef8f08c0e0fbd9959 /security/selinux
parent1a6509d991225ad210de54c63314fd9542922095 (diff)
[SELinux]: Fix double free in selinux_netlbl_sock_setsid()
As pointed out by Adrian Bunk, commit 45c950e0f839fded922ebc0bfd59b1081cc71b70 ("fix memory leak in netlabel code") caused a double-free when security_netlbl_sid_to_secattr() fails. This patch fixes this by removing the netlbl_secattr_destroy() call from that function since we are already releasing the secattr memory in selinux_netlbl_sock_setsid(). Signed-off-by: Paul Moore <paul.moore@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security/selinux')
-rw-r--r--security/selinux/ss/services.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index f96dec1f9258..880d455aa659 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -2692,7 +2692,6 @@ int security_netlbl_sid_to_secattr(u32 sid, struct netlbl_lsm_secattr *secattr)
2692 2692
2693netlbl_sid_to_secattr_failure: 2693netlbl_sid_to_secattr_failure:
2694 POLICY_RDUNLOCK; 2694 POLICY_RDUNLOCK;
2695 netlbl_secattr_destroy(secattr);
2696 return rc; 2695 return rc;
2697} 2696}
2698#endif /* CONFIG_NETLABEL */ 2697#endif /* CONFIG_NETLABEL */