apparmor: check label build before no_new_privs test
Subsystems (2)
PATCH 1/1 apparmor: check label build before no_new_privs test
aa_change_profile() builds a replacement label with fn_label_build_in_scope() before the no_new_privs subset check. The build helper can fail and return NULL or an ERR_PTR, but the result was passed to aa_label_is_unconfined_subset() before the existing IS_ERR_OR_NULL() check.
Reuse the existing target-label build failure handling immediately after the build. This preserves the current audit handling while preventing the subset helper from dereferencing an invalid label.
Signed-off-by Ruoyu Wang <[email protected]>
--- security/apparmor/domain.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
security/apparmor/domain.c +15 -10
@@ -1527,6 +1527,8 @@ int aa_change_profile(const char *fqname, int flags) new =fn_label_build_in_scope (label, profile,GFP_KERNEL ,aa_get_label (target),aa_get_label (&profile->label)); +if (IS_ERR_OR_NULL (new)) + goto build_fail;/* * no new privs prevents domain transitions that would * reduce restrictions.
@@ -1545,16 +1547,8 @@ int aa_change_profile(const char *fqname, int flags)/* only transition profiles in the current ns */ if (stack) new =aa_label_merge (label, target,GFP_KERNEL ); -if (IS_ERR_OR_NULL (new)) { - info ="failed to build target label" ; -if (!new) - error = -ENOMEM ; -else - error =PTR_ERR (new); - new =NULL ; - perms.allow =0 ; - goto audit; - } +if (IS_ERR_OR_NULL (new)) + goto build_fail; error =aa_replace_current_label (new); }else {if (new) {
@@ -1566,6 +1560,17 @@ int aa_change_profile(const char *fqname, int flags)aa_set_current_onexec (target, stack); } + goto audit; + +build_fail: + info ="failed to build target label" ; +if (!new) + error = -ENOMEM ; +else + error =PTR_ERR (new); + new =NULL ; + perms.allow =0 ; + audit: error = fn_for_each_in_scope(label, profile, aa_audit_file(subj_cred,
Signature · 1 line
2.51.0