From: Gen Zhang <blackgod016574@gmail.com>
To: Ondrej Mosnacek <omosnace@redhat.com>
Cc: Paul Moore <paul@paul-moore.com>,
Stephen Smalley <sds@tycho.nsa.gov>,
Eric Paris <eparis@parisplace.org>,
ccross@android.com, selinux@vger.kernel.org,
Linux kernel mailing list <linux-kernel@vger.kernel.org>,
netdev@vger.kernel.org
Subject: [PATCH v2] hooks: fix a missing-check bug in selinux_add_mnt_opt()
Date: Thu, 30 May 2019 16:54:38 +0800 [thread overview]
Message-ID: <20190530085438.GA2862@zhanggen-UX430UQ> (raw)
In-Reply-To: <CAFqZXNtX1R1VDFxm7Jco3BZ=pVnNiHU3-C=d8MhCVV1XSUQ8bw@mail.gmail.com>
In selinux_add_mnt_opt(), 'val' is allcoted by kmemdup_nul(). It returns
NULL when fails. So 'val' should be checked.
Signed-off-by: Gen Zhang <blackgod016574@gmail.com>
Fixes: 757cbe597fe8 ("LSM: new method: ->sb_add_mnt_opt()")
---
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 3ec702c..4797c63 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1052,8 +1052,11 @@ static int selinux_add_mnt_opt(const char *option, const char *val, int len,
if (token == Opt_error)
return -EINVAL;
- if (token != Opt_seclabel)
- val = kmemdup_nul(val, len, GFP_KERNEL);
+ if (token != Opt_seclabel) {
+ val = kmemdup_nul(val, len, GFP_KERNEL);
+ if (!val)
+ return -ENOMEM;
+ }
rc = selinux_add_opt(token, val, mnt_opts);
if (unlikely(rc)) {
kfree(val);
next prev parent reply other threads:[~2019-05-30 8:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-30 8:06 [PATCH] hooks: fix a missing-check bug in selinux_add_mnt_opt() Gen Zhang
2019-05-30 8:30 ` Ondrej Mosnacek
2019-05-30 8:54 ` Gen Zhang [this message]
2019-05-31 15:55 ` [PATCH v2] " Paul Moore
2019-06-01 1:54 ` Gen Zhang
2019-05-30 9:11 ` [PATCH] " Sergei Shtylyov
2019-05-30 9:18 ` Gen Zhang
2019-05-30 9:22 ` Sergei Shtylyov
2019-05-30 9:24 ` Gen Zhang
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=20190530085438.GA2862@zhanggen-UX430UQ \
--to=blackgod016574@gmail.com \
--cc=ccross@android.com \
--cc=eparis@parisplace.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=omosnace@redhat.com \
--cc=paul@paul-moore.com \
--cc=sds@tycho.nsa.gov \
--cc=selinux@vger.kernel.org \
/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