From: Bernard Zhao <bernard@vivo.com>
To: Paul Moore <paul@paul-moore.com>,
Stephen Smalley <stephen.smalley.work@gmail.com>,
Eric Paris <eparis@parisplace.org>,
selinux@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Bernard Zhao <bernard@vivo.com>
Subject: [PATCH] security/selinux: fix potential memleak in error branch
Date: Wed, 1 Dec 2021 19:12:09 -0800 [thread overview]
Message-ID: <20211202031209.253228-1-bernard@vivo.com> (raw)
This patch try to fix potential memleak in error branch.
Signed-off-by: Bernard Zhao <bernard@vivo.com>
---
security/selinux/hooks.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 62d30c0a30c2..10700720bb74 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -983,6 +983,7 @@ static int selinux_sb_clone_mnt_opts(const struct super_block *oldsb,
static int selinux_add_opt(int token, const char *s, void **mnt_opts)
{
struct selinux_mnt_opts *opts = *mnt_opts;
+ bool is_alloc_opts = false;
if (token == Opt_seclabel) /* eaten and completely ignored */
return 0;
@@ -992,9 +993,13 @@ static int selinux_add_opt(int token, const char *s, void **mnt_opts)
if (!opts)
return -ENOMEM;
*mnt_opts = opts;
+ is_alloc_opts = true;
}
- if (!s)
+ if (!s) {
+ if (is_alloc_opts)
+ kfree(opts);
return -ENOMEM;
+ }
switch (token) {
case Opt_context:
if (opts->context || opts->defcontext)
@@ -1020,6 +1025,8 @@ static int selinux_add_opt(int token, const char *s, void **mnt_opts)
return 0;
Einval:
pr_warn(SEL_MOUNT_FAIL_MSG);
+ if (is_alloc_opts)
+ kfree(opts);
return -EINVAL;
}
--
2.33.1
next reply other threads:[~2021-12-02 3:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-02 3:12 Bernard Zhao [this message]
2021-12-06 3:22 ` Paul Moore
[not found] ` <AI*AZgDuE3c1hmFv16p8r4qS.9.1638760990602.Hmail.bernard@vivo.com.@PENBSEM5VmhUNXRzMkF4K1BRMGhWNDhHek4teHBob2dmWk5Td0U5N0szLXRVWlM2MEJMd0BtYWlsLmdtYWlsLmNvbT4=>
2021-12-06 3:34 ` 答复: " 赵军奎
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=20211202031209.253228-1-bernard@vivo.com \
--to=bernard@vivo.com \
--cc=eparis@parisplace.org \
--cc=linux-kernel@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=selinux@vger.kernel.org \
--cc=stephen.smalley.work@gmail.com \
/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
all inboxes | Powered by JetHome®