From patchwork Thu May 11 07:05:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "tianjia.zhang" X-Patchwork-Id: 13237539 X-Patchwork-Delegate: paul@paul-moore.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5ABACC77B7C for ; Thu, 11 May 2023 07:06:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237396AbjEKHGP (ORCPT ); Thu, 11 May 2023 03:06:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230205AbjEKHGJ (ORCPT ); Thu, 11 May 2023 03:06:09 -0400 Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8982A6A79; Thu, 11 May 2023 00:05:31 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045192;MF=tianjia.zhang@linux.alibaba.com;NM=1;PH=DS;RN=12;SR=0;TI=SMTPD_---0ViJYCrx_1683788726; Received: from localhost(mailfrom:tianjia.zhang@linux.alibaba.com fp:SMTPD_---0ViJYCrx_1683788726) by smtp.aliyun-inc.com; Thu, 11 May 2023 15:05:27 +0800 From: Tianjia Zhang To: Serge Hallyn , Paul Moore , Stephen Smalley , Eric Paris , Frederick Lawler , Jens Axboe , Joseph Qi , linux-security-module@vger.kernel.org, selinux@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tianjia Zhang Subject: [PATCH 1/2] capability: Introduce CAP_BLOCK_ADMIN Date: Thu, 11 May 2023 15:05:19 +0800 Message-Id: <20230511070520.72939-2-tianjia.zhang@linux.alibaba.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230511070520.72939-1-tianjia.zhang@linux.alibaba.com> References: <20230511070520.72939-1-tianjia.zhang@linux.alibaba.com> MIME-Version: 1.0 Precedence: bulk List-ID: Separated fine-grained capability CAP_BLOCK_ADMIN from CAP_SYS_ADMIN. For backward compatibility, the CAP_BLOCK_ADMIN capability is included within CAP_SYS_ADMIN. Some database products rely on shared storage to complete the write-once-read-multiple and write-multiple-read-multiple functions. When HA occurs, they rely on the PR (Persistent Reservations) protocol provided by the storage layer to manage block device permissions to ensure data correctness. CAP_SYS_ADMIN is required in the PR protocol implementation of existing block devices in the Linux kernel, which has too many sensitive permissions, which may lead to risks such as container escape. The kernel needs to provide more fine-grained permission management like CAP_NET_ADMIN to avoid online products directly relying on root to run. CAP_BLOCK_ADMIN can also provide support for other block device operations that require CAP_SYS_ADMIN capabilities in the future, ensuring that applications run with least privilege. Signed-off-by: Tianjia Zhang --- include/linux/capability.h | 5 +++++ include/uapi/linux/capability.h | 7 ++++++- security/selinux/include/classmap.h | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/include/linux/capability.h b/include/linux/capability.h index 0c356a517991..95b81a75806f 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h @@ -208,6 +208,11 @@ static inline bool checkpoint_restore_ns_capable(struct user_namespace *ns) ns_capable(ns, CAP_SYS_ADMIN); } +static inline bool block_admin_capable(void) +{ + return capable(CAP_BLOCK_ADMIN) || capable(CAP_SYS_ADMIN); +} + /* audit system wants to get cap info from files as well */ int get_vfs_caps_from_disk(struct mnt_idmap *idmap, const struct dentry *dentry, diff --git a/include/uapi/linux/capability.h b/include/uapi/linux/capability.h index 3d61a0ae055d..7c07f5916289 100644 --- a/include/uapi/linux/capability.h +++ b/include/uapi/linux/capability.h @@ -417,7 +417,12 @@ struct vfs_ns_cap_data { #define CAP_CHECKPOINT_RESTORE 40 -#define CAP_LAST_CAP CAP_CHECKPOINT_RESTORE +/* + * Allow Persistent Reservations operations for block device + */ +#define CAP_BLOCK_ADMIN 41 + +#define CAP_LAST_CAP CAP_BLOCK_ADMIN #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h index a3c380775d41..83eb32e3a5cd 100644 --- a/security/selinux/include/classmap.h +++ b/security/selinux/include/classmap.h @@ -28,9 +28,9 @@ #define COMMON_CAP2_PERMS "mac_override", "mac_admin", "syslog", \ "wake_alarm", "block_suspend", "audit_read", "perfmon", "bpf", \ - "checkpoint_restore" + "checkpoint_restore", "block_admin" -#if CAP_LAST_CAP > CAP_CHECKPOINT_RESTORE +#if CAP_LAST_CAP > CAP_BLOCK_ADMIN #error New capability defined, please update COMMON_CAP2_PERMS. #endif