forked from Minki/linux
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: Paul Moore <paul.moore@hp.com> Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
parent
a7da60f415
commit
45c950e0f8
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user