Commit 89a3561e authored by Ryan Lee's avatar Ryan Lee Committed by John Johansen
Browse files

apparmor: force audit on unconfined exec if info is set by find_attach 



find_attach may set info if something unusual happens during that process
(currently only used to signal conflicting attachments, but this could be
expanded in the future). This is information that should be propagated to
userspace via an audit message.

Signed-off-by: default avatarRyan Lee <ryan.lee@canonical.com>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent 95ff1189

security/apparmor/domain.c

+16 −0
Original line number Diff line number Diff line
@@ -670,6 +670,22 @@ static struct aa_label *profile_transition(const struct cred *subj_cred, 
	if (profile_unconfined(profile)) {

		new = find_attach(bprm, profile->ns,

				  &profile->ns->base.profiles, name, &info);

		/* info set -> something unusual that we should report

		 * Currently this is only conflicting attachments, but other

		 * infos added in the future should also be logged by default

		 * and only excluded on a case-by-case basis

		 */

		if (info) {

			/* Because perms is never used again after this audit

			 * we don't need to care about clobbering it

			 */

			perms.audit |= MAY_EXEC;

			perms.allow |= MAY_EXEC;

			/* Don't cause error if auditing fails */

			(void) aa_audit_file(subj_cred, profile, &perms,

				OP_EXEC, MAY_EXEC, name, target, new, cond->uid,

				info, error);

		}

		if (new) {

			AA_DEBUG(DEBUG_DOMAIN, "unconfined attached to new label");

			return new;