From patchwork Thu Dec 5 01:09:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thi=C3=A9baud_Weksteen?= X-Patchwork-Id: 13894651 X-Patchwork-Delegate: paul@paul-moore.com Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA66717579 for ; Thu, 5 Dec 2024 01:09:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733360981; cv=none; b=gYLtR5Y/ruX5KOdMs6talylFFuUFGkZyB3vE5EawmXKSXcOU/snN9Ayxetei3CwQGgUl7TDrs8aWF/fOmJ/LmAWBOwjTFkInrPKu8Z1AsQShC8Cub7ulKXGs/N+va8Tad9d82TW/FRvMThkOprKK8/ISyB40XLzfFa/j1cvgO+Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733360981; c=relaxed/simple; bh=fK8aXyugHxZZ2C2Y/zkgdBQLIkxLT4EIWlla4y/kXg4=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=B0x4CO93f1TWoRew6ySK6Slsb/4gK59ZvFA8MlFcwLSOiB9oP4YjU5lBOTcSWyXI4EOP01RldngHVirqfNpQTIBGrenOc6y/ouRO7bTntrjNalPHxryJNT73Aj6SNhSnIDSzfQbYclPLgLHBbdpc9wXygamwDtnxrR/bxv47XVo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tweek.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=MzN2iVwo; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tweek.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="MzN2iVwo" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-72527c426a2so333815b3a.2 for ; Wed, 04 Dec 2024 17:09:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733360979; x=1733965779; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:from:to:cc:subject:date:message-id:reply-to; bh=n59Xnl6D50ylHiqQ1RjIxFw3EGEnTlwF1fv399YL458=; b=MzN2iVwoDcUaROIc8ynFpbFUanbanPTDBVR1TEXa0hZiH5b11HMPmmZTWCYSc+jkIE h+pc6VxhMEqRvbJTVUSmgTX+2jr1HIP77R7f8zxA5eDErDISEQSAfvag/8k5FJlx+AeC g2Zl8KlOQwuTZkNrFEozzK+D0UmgD7Y0Bb1/bmQIbeTRRG1LIkJPbhd9dO4hCUOczgDH OUdM/kkiA0IKItP7Ua5vVa1tcDHxBjv3eM2jcQ5pwAxUbHZR54Uz04JO+q3oex/bwEC3 kIWi7twM7mXEq4dh92Cy2ioFpTFB1goxkSuaspZ99td1xI/bgHkgR/4caxMhbKIXjCcR 3rgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733360979; x=1733965779; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=n59Xnl6D50ylHiqQ1RjIxFw3EGEnTlwF1fv399YL458=; b=hRa0d4vw558iGNZ+oNmwrafQCoW4Lz1NUX7zKnKmBY5Bn9oPvRsCdgYaIghSQjyYrH 4KHs4NiwfYqkh+CjMUCrquJIroDyGVUsALZo8DgClgXEeohCs9+lD+cC6fWJ24hrH5b/ 9pf+xCWzqWds0mparkMY+ZndWzd4n0aXTIrYHGDRnRx5FT3sUhl4cYGDBkeNcptltQ0v RucsFEhlTLUFRhGbySAPEv9JGRffl8052Mg9Ylpte2mh+gkwdayriuMvbPFC9tCpVSrt NkQg/KZc7N5LUMx7WJNr3PRMzv67bhbzMTU9hjtpYm2Cfcw2hQ0DmW8t2lY45o7Xft9y +SbA== X-Forwarded-Encrypted: i=1; AJvYcCWET4qxp0W6+fOIeZrwUELih6szSiniITToGd8hoU6DIOGC6Wc/g8a/++sW5o+CD1Pd9J/qtZ2/@vger.kernel.org X-Gm-Message-State: AOJu0Ywm3NtRLGWU2v1+9Q95r9r+T2IugRvIt0cLUjSaaio2vSHSKfda 9+d+LsA+rUgsK0FqAYq4M7AYmx059wTtk/atGPhU+UUgJjkOyEWfdeFANWA2KT5JzeroTAjtJA= = X-Google-Smtp-Source: AGHT+IG9q/7Y6jw7LO5D1bpEuo1BX4/QTu8OeJ5x0t6/Jsyxa1hzCp86q2jhrL5XYS6WhbIRB8FVkpXZ0g== X-Received: from pfbjo4.prod.google.com ([2002:a05:6a00:9084:b0:725:9eaa:f2f5]) (user=tweek job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1414:b0:71e:5b4a:66d4 with SMTP id d2e1a72fcca58-72587f00581mr9491823b3a.9.1733360979157; Wed, 04 Dec 2024 17:09:39 -0800 (PST) Date: Thu, 5 Dec 2024 12:09:19 +1100 Precedence: bulk X-Mailing-List: selinux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241205010919.1419288-1-tweek@google.com> Subject: [PATCH v2] selinux: ignore unknown extended permissions From: " =?utf-8?q?Thi=C3=A9baud_Weksteen?= " To: Paul Moore Cc: " =?utf-8?q?Christian_G=C3=B6ttsche?= " , Stephen Smalley , " =?utf-8?q?Bram_Bonn?= =?utf-8?q?=C3=A9?= " , Jeffrey Vander Stoep , selinux@vger.kernel.org, " =?utf-8?q?Thi=C3=A9baud_Weksteen?= " , stable@vger.kernel.org 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. Fixes: fa1aa143ac4a ("selinux: extended permissions for ioctls") Cc: stable@vger.kernel.org Signed-off-by: Thiébaud Weksteen --- v2: Add pr_warn_once, remove other BUG() call for key.specified security/selinux/ss/services.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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); } }