selinux: fix a missing-check bug in selinux_add_mnt_opt( )
PATCH v4 1/1 selinux: fix a missing-check bug in selinux_add_mnt_opt( )
In selinux_add_mnt_opt(), 'val' is allocated by kmemdup_nul(). It returns NULL when fails. So 'val' should be checked. And 'mnt_opts' should be freed when error.
---
security/selinux/hooks.c +15 -6
@@ -1052,15 +1052,24 @@ 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) { + rc = -ENOMEM ; + goto free_opt; + } + } rc =selinux_add_opt (token, val, mnt_opts);if (unlikely (rc)) {kfree (val); -if (*mnt_opts) { -selinux_free_mnt_opts (*mnt_opts); - *mnt_opts =NULL ; - } + goto free_opt; + } +return rc; + +free_opt: +if (*mnt_opts) { +selinux_free_mnt_opts (*mnt_opts); + *mnt_opts =NULL ; }return rc; }
Paul Moore
maintainerQuoted 13 lines · Gen Zhang
In
selinux_add_mnt_opt(), 'val' is allocated bykmemdup_nul(). It returns NULL when fails. So 'val' should be checked. And 'mnt_opts' should be freed when error.Signed-off-by Gen Zhang <[email protected]>Fixes 757cbe597fe8 ("LSM: new method: ->sb_add_mnt_opt()")---
security/selinux/hooks.c +0
-0@@ -1052,15 +1052,24 @@ static int selinux_add_mnt_opt(const char *option, const char *val, int len,if (token == Opt_error)
security/selinux/hooks.c static int selinux_add_mnt_opt(const char *option, const char *val, int len, · line 1060
Quoted 10 lines
security/selinux/hooks.c +6
-2return -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) { + rc = -ENOMEM ; + goto free_opt; + }
This block has an extra indent, but I'll go ahead and fix that during the merge. I have to mention that had you run this patch through ./scripts/checkpatch.pl it would have caught the mistake :)
Regardless, thanks for the patch, I've merged it into the selinux/stable-5.2 branch and I'll be testing it shortly.
Quoted 19 lines
security/selinux/hooks.c +9
-4+ } rc =selinux_add_opt (token, val, mnt_opts);if (unlikely (rc)) {kfree (val); -if (*mnt_opts) { -selinux_free_mnt_opts (*mnt_opts); - *mnt_opts =NULL ; - } + goto free_opt; + } +return rc; + +free_opt: +if (*mnt_opts) { +selinux_free_mnt_opts (*mnt_opts); + *mnt_opts =NULL ; }return rc; }
Signature · 2 lines
paul moore www.paul-moore.com