hooks: fix a missing-check bug in selinux_sb_eat_lsm_opts()
Subsystems (4)
PATCH v2 1/1 hooks: fix a missing-check bug in selinux_sb_eat_lsm_opts()
In selinux_sb_eat_lsm_opts(), 'arg' is allocated by kmemdup_nul(). It returns NULL when fails. So 'arg' should be checked.
---
security/selinux/hooks.c +2 -0
@@ -2635,6 +2635,8 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts) *q++ = c; } arg =kmemdup_nul (arg, q - arg,GFP_KERNEL ); +if (!arg) +return -ENOMEM ; } rc =selinux_add_opt (token, arg, mnt_opts);if (unlikely (rc)) {
Paul Moore
maintainerQuoted 7 lines · Gen Zhang
In
selinux_sb_eat_lsm_opts(), 'arg' is allocated bykmemdup_nul(). It returns NULL when fails. So 'arg' should be checked.Signed-off-by Gen Zhang <[email protected]>Reviewed-by Ondrej Mosnacek <[email protected]>Fixes 99dbbb593fe6 ("selinux: rewrite selinux_sb_eat_lsm_opts()")
One quick note about the subject line, instead of using "hooks:" you should use "selinux:" since this is specific to SELinux. If the patch did apply to the LSM framework as a whole, I would suggest using "lsm:" instead of "hooks:" as "hooks" is too ambiguous of a prefix.
security/selinux/hooks.c static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts) · line 2639
Quoted 10 lines
security/selinux/hooks.c +2
-0@@ -2635,6 +2635,8 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts) *q++ = c; } arg =kmemdup_nul (arg, q - arg,GFP_KERNEL ); +if (!arg) +return -ENOMEM ;
It seems like we should also check for, and potentially free *mnt_opts as the selinux_add_opt() error handling does just below this change, yes? If that is the case we might want to move that error handling code to the bottom of the function and jump there on error.
Quoted 3 lines
security/selinux/hooks.c +0
-0} rc =selinux_add_opt (token, arg, mnt_opts);if (unlikely (rc)) {
Signature · 2 lines
paul moore www.paul-moore.com
Quoted 30 lines · Paul Moore
Quoted 7 lines · Gen Zhang
In
selinux_sb_eat_lsm_opts(), 'arg' is allocated bykmemdup_nul(). It returns NULL when fails. So 'arg' should be checked.Signed-off-by Gen Zhang <[email protected]>Reviewed-by Ondrej Mosnacek <[email protected]>Fixes 99dbbb593fe6 ("selinux: rewrite selinux_sb_eat_lsm_opts()")One quick note about the subject line, instead of using "hooks:" you should use "selinux:" since this is specific to SELinux. If the patch did apply to the LSM framework as a whole, I would suggest using "lsm:" instead of "hooks:" as "hooks" is too ambiguous of a prefix.
security/selinux/hooks.c static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts) · line 2639
Quoted 10 lines
security/selinux/hooks.c +2
-0@@ -2635,6 +2635,8 @@ static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts) *q++ = c; } arg =kmemdup_nul (arg, q - arg,GFP_KERNEL ); +if (!arg) +return -ENOMEM ;It seems like we should also check for, and potentially free
*mnt_optsas theselinux_add_opt()error handling does just below this change, yes? If that is the case we might want to move that error handling code to the bottom of the function and jump there on error.
Quoted 7 lines
Quoted 3 lines
security/selinux/hooks.c +0
-0} rc =selinux_add_opt (token, arg, mnt_opts);if (unlikely (rc)) {Signature · 2 lines
paul moore www.paul-moore.com
Yes, I agree with that. And I will work on this to resubmit.
Thanks
Gen