diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-21 19:45:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-21 19:45:49 -0800 |
| commit | 8b85eaadd5b8d3786996bd74c73aff54a92ec456 (patch) | |
| tree | 7ef6ed3e5955a45d54b1d223e3ebf7749aa3b918 | |
| parent | f290fc3669d659a915e29b6bdb82d454b437cf93 (diff) | |
| parent | 45c950e0f839fded922ebc0bfd59b1081cc71b70 (diff) | |
| download | linux-8b85eaadd5b8d3786996bd74c73aff54a92ec456.tar.gz linux-8b85eaadd5b8d3786996bd74c73aff54a92ec456.tar.bz2 linux-8b85eaadd5b8d3786996bd74c73aff54a92ec456.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
selinux: fix memory leak in netlabel code
| -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 d243ddc723a5..66e013d6f6f6 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 d572dc908f31..f83b19daed16 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; |