]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[SELinux]: Fix double free in selinux_netlbl_sock_setsid()
authorPaul Moore <paul.moore@hp.com>
Tue, 29 Jan 2008 03:49:00 +0000 (19:49 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 Feb 2008 03:27:04 +0000 (19:27 -0800)
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>
security/selinux/ss/services.c

index f96dec1f9258f31c88525543c59d586354619649..880d455aa659014c336965d6152575b191072cad 100644 (file)
@@ -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 */