apparmor: domain: clean up duplicated parts of handle_onexec()
Subsystems (2)
PATCH 1/1 apparmor: domain: clean up duplicated parts of handle_onexec()
Regression test of AppArmor finished without any failures.
PASSED: aa_exec access attach_disconnected at_secure introspect capabilities changeprofile onexec changehat changehat_fork changehat_misc chdir clone coredump deleted e2e environ exec exec_qual fchdir fd_inheritance fork i18n link link_subset mkdir mmap mount mult_mount named_pipe namespaces net_raw open openat pipe pivot_root posix_ipc ptrace pwrite query_label regex rename readdir rw socketpair swap sd_flags setattr symlink syscall sysv_ipc tcp unix_fd_server unix_socket_pathname unix_socket_abstract unix_socket_unnamed unix_socket_autobind unlink userns xattrs xattrs_profile longpath nfs exec_stack aa_policy_cache nnp stackonexec stackprofile
FAILED:
make: Leaving directory '/apparmor/tests/regression/apparmor'
--- security/apparmor/domain.c | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-)
security/apparmor/domain.c +11 -26
@@ -822,33 +822,18 @@ static struct aa_label *handle_onexec(const struct cred *subj_cred,AA_BUG (!bprm);AA_BUG (!buffer); -if (!stack) { - error =fn_for_each_in_ns (label, profile, -profile_onexec (subj_cred, profile, onexec, stack, - bprm, buffer, cond, unsafe)); -if (error) -return ERR_PTR (error); - new =fn_label_build_in_ns (label, profile,GFP_KERNEL , -aa_get_newest_label (onexec), -profile_transition (subj_cred, profile, bprm, - buffer, - cond, unsafe)); - - }else { -/* TODO: determine how much we want to loosen this */ - error =fn_for_each_in_ns (label, profile, -profile_onexec (subj_cred, profile, onexec, stack, bprm, - buffer, cond, unsafe)); -if (error) -return ERR_PTR (error); - new =fn_label_build_in_ns (label, profile,GFP_KERNEL , -aa_label_merge (&profile->label, onexec, -GFP_KERNEL ), -profile_transition (subj_cred, profile, bprm, - buffer, - cond, unsafe)); - } +/* TODO: determine how much we want to loosen this */ + error =fn_for_each_in_ns (label, profile, +profile_onexec (subj_cred, profile, onexec, stack, + bprm, buffer, cond, unsafe)); +if (error) +return ERR_PTR (error); + new =fn_label_build_in_ns (label, profile,GFP_KERNEL , + stack ?aa_label_merge (&profile->label, onexec,GFP_KERNEL ) + :aa_get_newest_label (onexec), +profile_transition (subj_cred, profile, bprm, + buffer, cond, unsafe));if (new)return new;
Signature · 1 line
2.34.1
Quoted 14 lines · Leesoo Ahn
Regression test of AppArmor finished without any failures.
PASSED:
aa_execaccessattach_disconnectedat_secureintrospect capabilities changeprofile onexec changehatchangehat_forkchangehat_miscchdir clone coredump deleted e2e environ execexec_qualfchdirfd_inheritancefork i18n linklink_subsetmkdir mmap mountmult_mountnamed_pipenamespacesnet_rawopen openat pipepivot_rootposix_ipcptrace pwritequery_labelregex rename readdir rw socketpair swapsd_flagssetattr symlink syscallsysv_ipctcpunix_fd_serverunix_socket_pathnameunix_socket_abstractunix_socket_unnamedunix_socket_autobindunlink userns xattrsxattrs_profilelongpath nfsexec_stackaa_policy_cachennp stackonexec stackprofile
FAILED:
make: Leaving directory '/apparmor/tests/regression/apparmor'
Quoted 1 line
Signed-off-by Leesoo Ahn <[email protected]>
this was pulled into my tree, sorry for missing the reply earlier
Quoted 53 lines
--- security/apparmor/domain.c | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-)security/apparmor/domain.c +11
-26@@ -822,33 +822,18 @@ static struct aa_label *handle_onexec(const struct cred *subj_cred,AA_BUG (!bprm);AA_BUG (!buffer); -if (!stack) { - error =fn_for_each_in_ns (label, profile, -profile_onexec (subj_cred, profile, onexec, stack, - bprm, buffer, cond, unsafe)); -if (error) -return ERR_PTR (error); - new =fn_label_build_in_ns (label, profile,GFP_KERNEL , -aa_get_newest_label (onexec), -profile_transition (subj_cred, profile, bprm, - buffer, - cond, unsafe)); - - }else { -/* TODO: determine how much we want to loosen this */ - error =fn_for_each_in_ns (label, profile, -profile_onexec (subj_cred, profile, onexec, stack, bprm, - buffer, cond, unsafe)); -if (error) -return ERR_PTR (error); - new =fn_label_build_in_ns (label, profile,GFP_KERNEL , -aa_label_merge (&profile->label, onexec, -GFP_KERNEL ), -profile_transition (subj_cred, profile, bprm, - buffer, - cond, unsafe)); - } +/* TODO: determine how much we want to loosen this */ + error =fn_for_each_in_ns (label, profile, +profile_onexec (subj_cred, profile, onexec, stack, + bprm, buffer, cond, unsafe)); +if (error) +return ERR_PTR (error); + new =fn_label_build_in_ns (label, profile,GFP_KERNEL , + stack ?aa_label_merge (&profile->label, onexec,GFP_KERNEL ) + :aa_get_newest_label (onexec), +profile_transition (subj_cred, profile, bprm, + buffer, cond, unsafe));if (new)return new;