From: Paul Moore Date: Tue, 29 Jan 2008 03:49:00 +0000 (-0800) Subject: [SELinux]: Fix double free in selinux_netlbl_sock_setsid() X-Git-Tag: v2.6.25-rc1~1089^2~132 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e1770d97a730ff4c3aa1775d98f4d0558390607f;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: David S. Miller --- diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index f96dec1f925..880d455aa65 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) netlbl_sid_to_secattr_failure: POLICY_RDUNLOCK; - netlbl_secattr_destroy(secattr); return rc; } #endif /* CONFIG_NETLABEL */