From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 187D0392C29; Tue, 21 Jul 2026 18:09:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784657371; cv=none; b=BAeAu4LYaeIIdxdNbQywrG/CptLNCR4npLRSfUG1x37N+yiv2/rsbON3/QMTBLCO/7p+CIvd2fux2lj7pZqFXIJ7EXJmmEhDHaZzjENBp8kSIeMv+Dqz+Gd4DN4iUU7c1Ilx0WVl2y5yrSTNGRcP9ZTEggiAH952CW+nAxSonoM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784657371; c=relaxed/simple; bh=ILkCGeUAHqjA5GJtCNXJXQNCOMipf7NT+z4piN3xH0s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l8zZpgGutfShoUVXy/pnf1XjABlV/tWCS1mlc7E7v8a+6l1V8b098Td7DJL/1gki1BcjGQ09vNaUxvpTPUOcF2/QNcomflEo/iup85R+lkE9WwsKHcVZsylwZSYZIJ+X7mK55Xfqw1SBFI7HFVJtVQ4puFjnUh/hIzIad5HdDlU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QLa+QRdw; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="QLa+QRdw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FB941F00A3D; Tue, 21 Jul 2026 18:09:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784657369; bh=shuaAoveTf1loKdE8+9IU4iXaWEntfYU9yyM9yo+J4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QLa+QRdwA/qDLLNYbOLzBAtTCRaDyz8EmC6ji/WZrIJT2O7YaT3/VHh0auZ1iaJmt L8UZNEVldvL9tSvHABcSfH4ms5y2e72yNxyhdkIT4ZhXsrA3PiX7ylwN/TEuBIttCv GuSl4SdwJs0K1vphZajz1dXLO5tDz26Nkn25OSlQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ruoyu Wang , John Johansen , Sasha Levin Subject: [PATCH 6.18 0737/1611] apparmor: check label build before no_new_privs test Date: Tue, 21 Jul 2026 17:14:13 +0200 Message-ID: <20260721152531.956078011@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ruoyu Wang [ Upstream commit a58cafd38b46fb1a2220e2fbbcfe291ea75fa147 ] 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. Fixes: e00b02bb6ac2a ("apparmor: move change_profile mediation to using labels") Signed-off-by: Ruoyu Wang Signed-off-by: John Johansen Signed-off-by: Sasha Levin --- security/apparmor/domain.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c index 267da82afb14ab..cc54c1205efe82 100644 --- a/security/apparmor/domain.c +++ b/security/apparmor/domain.c @@ -1525,6 +1525,8 @@ int aa_change_profile(const char *fqname, int flags) new = fn_label_build_in_ns(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. @@ -1543,16 +1545,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) { @@ -1564,6 +1558,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_ns(label, profile, aa_audit_file(subj_cred, -- 2.53.0