summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorPaul Moore <paul@paul-moore.com>2021-12-21 15:01:29 -0500
committerPaul Moore <paul@paul-moore.com>2021-12-21 15:14:45 -0500
commit6cd9d4b97891560b61681cad9cc4307ce0719abc (patch)
tree8ac54651f2ec6ce826eb6bfe4190ef0247f65b71 /security
parent2e08df3c7c4e4e74e3dd5104c100f0bf6288aaa8 (diff)
downloadlinux-6cd9d4b97891560b61681cad9cc4307ce0719abc.tar.bz2
selinux: minor tweaks to selinux_add_opt()
Two minor edits to selinux_add_opt(): use "sizeof(*ptr)" instead of "sizeof(type)" in the kzalloc() call, and rename the "Einval" jump target to "err" for the sake of consistency. Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 8ef63b7af855..904f9c23f0f6 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -972,14 +972,14 @@ 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 */
+ 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);
+ opts = kzalloc(sizeof(*opts), GFP_KERNEL);
if (!opts)
return -ENOMEM;
*mnt_opts = opts;
@@ -989,27 +989,29 @@ static int selinux_add_opt(int token, const char *s, void **mnt_opts)
switch (token) {
case Opt_context:
if (opts->context || opts->defcontext)
- goto Einval;
+ goto err;
opts->context = s;
break;
case Opt_fscontext:
if (opts->fscontext)
- goto Einval;
+ goto err;
opts->fscontext = s;
break;
case Opt_rootcontext:
if (opts->rootcontext)
- goto Einval;
+ goto err;
opts->rootcontext = s;
break;
case Opt_defcontext:
if (opts->context || opts->defcontext)
- goto Einval;
+ goto err;
opts->defcontext = s;
break;
}
+
return 0;
-Einval:
+
+err:
if (is_alloc_opts) {
kfree(opts);
*mnt_opts = NULL;