From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 F170A193408 for ; Mon, 23 Dec 2024 10:34:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734950078; cv=none; b=J4B2gCQBgRa9QH6GGhkGrskDh5frhFLM9wtxxXaDgXAmQPpiK0Ai2LU377OABk+h+3AQVA/R6fqLk1bltOG2oCNNsbk5FZ3x3C2RuGTtEwDFZJTitt2YxtztPTs/TcB3fqTS/WjGSYTv+CxbfvtgLyleaqPHFnEwfWk9D47825s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734950078; c=relaxed/simple; bh=KL+t36XcEn8IgXNyD8bLb4T/kh6CD5jrD+DHZ/YW6pI=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=SQSBSQOvKg/K3GarBHBzlJzvT/+zK5YR7rGAYOC3R9Yr1Z19qVe72HbH9+zHe+TVB200zxeMYstX92++rk2L8SWsBnRx+BfV+vD35NHm/KyJWH9b1idHlp7Tx05A0yp8sKEx6FjpwuPeF/zba6LYuHKLqBcz6Rtoyb7+khz9Ds0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EIDtnL0i; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="EIDtnL0i" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 455C4C4CED3; Mon, 23 Dec 2024 10:34:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734950077; bh=KL+t36XcEn8IgXNyD8bLb4T/kh6CD5jrD+DHZ/YW6pI=; h=Subject:To:Cc:From:Date:From; b=EIDtnL0iaQHvMXPmls7oFOWdS4CPzoO8/2z6n7QRDk3cVzcbgOx9QC2JmADZkgyiS 9LmT90T+D3GiqJc49bpxa7VMLBigRSu4mZuYoUymWGp5pOsZ4eIIBoJEFOCP/3w59K IGRLE9iLrSqjeTXyHC8DX/xJxai1Jlej3NeTQJ3c= Subject: FAILED: patch "[PATCH] selinux: ignore unknown extended permissions" failed to apply to 6.1-stable tree To: tweek@google.com,paul@paul-moore.com Cc: From: Date: Mon, 23 Dec 2024 11:34:21 +0100 Message-ID: <2024122321-blubber-backer-885c@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 900f83cf376bdaf798b6f5dcb2eae0c822e908b6 # git commit -s git send-email --to '' --in-reply-to '2024122321-blubber-backer-885c@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 900f83cf376bdaf798b6f5dcb2eae0c822e908b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thi=C3=A9baud=20Weksteen?= Date: Thu, 5 Dec 2024 12:09:19 +1100 Subject: [PATCH] selinux: ignore unknown extended permissions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When evaluating extended permissions, ignore unknown permissions instead of calling BUG(). This commit ensures that future permissions can be added without interfering with older kernels. Cc: stable@vger.kernel.org Fixes: fa1aa143ac4a ("selinux: extended permissions for ioctls") Signed-off-by: Thiébaud Weksteen Signed-off-by: Paul Moore diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 971c45d576ba..3d5c563cfc4c 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -979,7 +979,10 @@ void services_compute_xperms_decision(struct extended_perms_decision *xpermd, return; break; default: - BUG(); + pr_warn_once( + "SELinux: unknown extended permission (%u) will be ignored\n", + node->datum.u.xperms->specified); + return; } if (node->key.specified == AVTAB_XPERMS_ALLOWED) { @@ -998,7 +1001,8 @@ void services_compute_xperms_decision(struct extended_perms_decision *xpermd, &node->datum.u.xperms->perms, xpermd->dontaudit); } else { - BUG(); + pr_warn_once("SELinux: unknown specified key (%u)\n", + node->key.specified); } }