Skip to contentSkip to conversation

Small memory-leak patchset

PATCH In review Paul Moore 2 participants 4 messages Aug 1, 2007 – Aug 2, 2007

Subsystems (5)
Networking Network drivers SELinux security module Networking IPsec +1 more subsystems
lore
Share & tools
lore

Paul Moore

author
#0 lore raw

cover Small memory-leak patchset

While doing some other work I found some small memory leaks with the way we are using security_secid_to_secctx() in some of the auditing code paths. We also had a redundant NULL pointer check in the SELinux function which frees the leaked memory. This patchset fixes both of these issues.

This patchset is backed against Linus' tree from this morning and has been lightly tested.

Signature · 2 lines
paul moore
linux security @ hp
author
#1 lore raw

PATCH 1/2 SELinux: remove redundant pointer checks before calling kfree()

We don't need to check for NULL pointers before calling kfree().

Signed-off-by Paul Moore <[email protected]>
---
 security/selinux/hooks.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
security/selinux/hooks.c +1 -2
Index: linux-2.6_secctx-leaks/security/selinux/hooks.c
===================================================================
@@ -4658,8 +4658,7 @@ static int selinux_secid_to_secctx(u32 s
 
 static void selinux_release_secctx(char *secdata, u32 seclen)
 {
-	if (secdata)
-		kfree(secdata);
+	kfree(secdata);
 }
 
 #ifdef CONFIG_KEYS
Signature · 2 lines
paul moore
linux security @ hp
author
#2 lore raw

PATCH 2/2 NET: fix memory leaks from security_secid_to_secctx()

In reply to Paul Moore

The security_secid_to_secctx() function returns memory that must be freed by a call to security_release_secctx() which was not always happening. This patch fixes two of these problems (all that I could find in the kernel source at present).

Signed-off-by Paul Moore <[email protected]>
---
 net/netlabel/netlabel_user.c |    4 +++-
 net/xfrm/xfrm_policy.c       |    5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)
net/netlabel/netlabel_user.c +3 -1
Index: linux-2.6_secctx-leaks/net/netlabel/netlabel_user.c
===================================================================
@@ -113,8 +113,10 @@ struct audit_buffer *netlbl_audit_start_
 	if (audit_info->secid != 0 &&
 	    security_secid_to_secctx(audit_info->secid,
 				     &secctx,
-				     &secctx_len) == 0)
+				     &secctx_len) == 0) {
 		audit_log_format(audit_buf, " subj=%s", secctx);
+		security_release_secctx(secctx, secctx_len);
+	}
 
 	return audit_buf;
 }
net/xfrm/xfrm_policy.c +3 -2
Index: linux-2.6_secctx-leaks/net/xfrm/xfrm_policy.c
===================================================================
@@ -2195,9 +2195,10 @@ void xfrm_audit_log(uid_t auid, u32 sid,
 	}
 
 	if (sid != 0 &&
-		security_secid_to_secctx(sid, &secctx, &secctx_len) == 0)
+	    security_secid_to_secctx(sid, &secctx, &secctx_len) == 0) {
 		audit_log_format(audit_buf, " subj=%s", secctx);
-	else
+		security_release_secctx(secctx, secctx_len);
+	} else
 		audit_log_task_context(audit_buf);
 
 	if (xp) {
Signature · 2 lines
paul moore
linux security @ hp
#3 lore raw

Re: [PATCH 2/2] NET: fix memory leaks from security_secid_to_secctx()

Both patches applied to:

git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6.git#for-akpm

Signature · 7 lines
James Morris
<[email protected]>

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe selinux" without quotes as the message.