Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45c950e0 authored by Paul Moore's avatar Paul Moore Committed by James Morris
Browse files

selinux: fix memory leak in netlabel code 

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: default avatarPaul Moore <paul.moore@hp.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent a7da60f4

security/selinux/netlabel.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -53,10 +53,11 @@ static int selinux_netlbl_sock_setsid(struct sock *sk, u32 sid) 
	struct sk_security_struct *sksec = sk->sk_security;

	struct sk_security_struct *sksec = sk->sk_security;

	struct netlbl_lsm_secattr secattr;

	struct netlbl_lsm_secattr secattr;





	netlbl_secattr_init(&secattr);



	rc = security_netlbl_sid_to_secattr(sid, &secattr);

	rc = security_netlbl_sid_to_secattr(sid, &secattr);

	if (rc != 0)

	if (rc != 0)

		return rc;

		goto sock_setsid_return;



	rc = netlbl_sock_setattr(sk, &secattr);

	rc = netlbl_sock_setattr(sk, &secattr);

	if (rc == 0) {

	if (rc == 0) {

		spin_lock_bh(&sksec->nlbl_lock);

		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);

		spin_unlock_bh(&sksec->nlbl_lock);

	}

	}





sock_setsid_return:

	netlbl_secattr_destroy(&secattr);

	return rc;

	return rc;

}

}

security/selinux/ss/services.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -2606,8 +2606,6 @@ int security_netlbl_sid_to_secattr(u32 sid, struct netlbl_lsm_secattr *secattr) 
	int rc = -ENOENT;

	int rc = -ENOENT;

	struct context *ctx;

	struct context *ctx;





	netlbl_secattr_init(secattr);



	if (!ss_initialized)

	if (!ss_initialized)

		return 0;

		return 0;