selinux: fix memory leak in netlabel code
authorPaul Moore <paul.moore@hp.com>
Mon, 21 Jan 2008 22:31:00 +0000 (09:31 +1100)
committerJames Morris <jmorris@namei.org>
Mon, 21 Jan 2008 22:31:00 +0000 (09:31 +1100)
Fix a memory leak in security_netlbl_sid_to_secattr() as reported here:
 * https://bugzilla.redhat.com/show_bug.cgi?id=352281

Signed-off-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: James Morris <jmorris@namei.org>
security/selinux/netlabel.c
security/selinux/ss/services.c

index d243ddc723a55c06c507dbc2cdcca14c425d54f9..66e013d6f6f6f081665a62c7b3a733b14b4d2cb7 100644 (file)
@@ -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;
 }
 
index d572dc908f313f7f1aa9db88042ba920982240b9..f83b19daed16181a86ede00b8d1455432f05acec 100644 (file)
@@ -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;