mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-16 04:04:06 +00:00
selinux: fix potential memleak in selinux_add_opt()
[ Upstream commit2e08df3c7c
] This patch try to fix potential memleak in error branch. Fixes:ba64186233
("selinux: new helper - selinux_add_opt()") Signed-off-by: Bernard Zhao <bernard@vivo.com> [PM: tweak the subject line, add Fixes tag] Signed-off-by: Paul Moore <paul@paul-moore.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
96560598d7
commit
6bb77e89ea
1 changed files with 10 additions and 2 deletions
|
@ -987,18 +987,22 @@ out:
|
|||
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;
|
||||
|
||||
if (!s)
|
||||
return -ENOMEM;
|
||||
|
||||
if (!opts) {
|
||||
opts = kzalloc(sizeof(struct selinux_mnt_opts), GFP_KERNEL);
|
||||
if (!opts)
|
||||
return -ENOMEM;
|
||||
*mnt_opts = opts;
|
||||
is_alloc_opts = true;
|
||||
}
|
||||
if (!s)
|
||||
return -ENOMEM;
|
||||
|
||||
switch (token) {
|
||||
case Opt_context:
|
||||
if (opts->context || opts->defcontext)
|
||||
|
@ -1023,6 +1027,10 @@ static int selinux_add_opt(int token, const char *s, void **mnt_opts)
|
|||
}
|
||||
return 0;
|
||||
Einval:
|
||||
if (is_alloc_opts) {
|
||||
kfree(opts);
|
||||
*mnt_opts = NULL;
|
||||
}
|
||||
pr_warn(SEL_MOUNT_FAIL_MSG);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue