public inbox for linux-audit@redhat.com
 help / color / mirror / Atom feed
From: Yi Wang <wang.yi59@zte.com.cn>
To: paul@paul-moore.com
Cc: eparis@redhat.com, linux-audit@redhat.com,
	linux-kernel@vger.kernel.org, jiang.biao2@zte.com.cn,
	wang.yi59@zte.com.cn, zhong.weidong@zte.com.cn
Subject: [PATCH] audit: fix potential null dereference 'context->module.name'
Date: Tue, 24 Jul 2018 13:57:14 +0800	[thread overview]
Message-ID: <1532411834-33775-1-git-send-email-wang.yi59@zte.com.cn> (raw)

The variable 'context->module.name' may be null pointer when
kmalloc return null, so it's better to check it before using
to avoid null dereference.

Signed-off-by: Yi Wang <wang.yi59@zte.com.cn>
Reviewed-by: Jiang Biao <jiang.biao2@zte.com.cn>
---
 kernel/auditsc.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index e80459f..4830b83 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1272,8 +1272,12 @@ static void show_special(struct audit_context *context, int *call_panic)
 		break;
 	case AUDIT_KERN_MODULE:
 		audit_log_format(ab, "name=");
-		audit_log_untrustedstring(ab, context->module.name);
-		kfree(context->module.name);
+		if (context->module.name) {
+			audit_log_untrustedstring(ab, context->module.name);
+			kfree(context->module.name);
+		} else
+			audit_log_format(ab, "(null)");
+
 		break;
 	}
 	audit_log_end(ab);
@@ -2409,7 +2413,8 @@ void __audit_log_kern_module(char *name)
 	struct audit_context *context = current->audit_context;
 
 	context->module.name = kmalloc(strlen(name) + 1, GFP_KERNEL);
-	strcpy(context->module.name, name);
+	if (context->module.name)
+		strcpy(context->module.name, name);
 	context->type = AUDIT_KERN_MODULE;
 }
 
-- 
1.8.3.1

             reply	other threads:[~2018-07-24  5:57 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-24  5:57 Yi Wang [this message]
2018-07-24 11:39 ` [PATCH] audit: fix potential null dereference 'context->module.name' Eric Paris
2018-07-24 19:55   ` Paul Moore
2018-07-24 22:38     ` Eric Paris
2018-07-24 23:38       ` Paul Moore
2018-07-25  0:55         ` wang.yi59

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1532411834-33775-1-git-send-email-wang.yi59@zte.com.cn \
    --to=wang.yi59@zte.com.cn \
    --cc=eparis@redhat.com \
    --cc=jiang.biao2@zte.com.cn \
    --cc=linux-audit@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=paul@paul-moore.com \
    --cc=zhong.weidong@zte.com.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox