diff options
| author | Paul Moore <paul.moore@hp.com> | 2008-01-28 19:49:00 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-31 19:27:04 -0800 |
| commit | e1770d97a730ff4c3aa1775d98f4d0558390607f (patch) | |
| tree | 64ad3c2d24b5506861aac9cef8f08c0e0fbd9959 /security | |
| parent | 1a6509d991225ad210de54c63314fd9542922095 (diff) | |
| download | linux-3.10-e1770d97a730ff4c3aa1775d98f4d0558390607f.tar.gz linux-3.10-e1770d97a730ff4c3aa1775d98f4d0558390607f.tar.bz2 linux-3.10-e1770d97a730ff4c3aa1775d98f4d0558390607f.zip | |
[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')
| -rw-r--r-- | security/selinux/ss/services.c | 1 |
1 files changed, 0 insertions, 1 deletions
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 */ |