From patchwork Fri Jun 9 10:21:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingbo Xu X-Patchwork-Id: 105539 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp851919vqr; Fri, 9 Jun 2023 03:43:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7LZ4aiBZChF2S0jDSzERAETOMYpq8fF35lDn4jb8WN5PxfdO32Og5pCAkwppmYJBANl00V X-Received: by 2002:a05:6a20:9382:b0:10b:ca02:1a5e with SMTP id x2-20020a056a20938200b0010bca021a5emr884428pzh.55.1686307412718; Fri, 09 Jun 2023 03:43:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686307412; cv=none; d=google.com; s=arc-20160816; b=A5Z5UU7gmmpWdP3YBcU4nRy4TSJdulOx5AAaHeUxyjxynQJ8ky4SHI+CVtlkW2rvfX pxz79yVPOtRZiOSHDm3BgfccA7FEzwjp3z4/TsUVpMBlsiXsHQ7r0/4jdjXMp3+j/RtQ 17zI68sp48/zqqbF0+Miq1UUChrVRo/uX0oBWoR8SguL3HKZC4NSPUd1o0OAFnOz1yxI MQ9ljTcSMcQVB1P8IA20lOjcfClJKMOEg2ePHoBdE8U0uimhpI5+aV0NVZt8xYie/I+C cMEfqakdvXy+BX0/9oxVc2cVDxCJgkLALKLHRyeS6xyNr/hHGkILUJC1dVGcFo6rzPOt qi0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Phbd+wiTFI9YcfUSKM/w6/Mellr4/SojU0WN0jHBBhk=; b=Uz3bIaKMHjULgbX+EC+zv0Vk39ou8heSG488Oc8+lgJ9ATLfFZLTZ8v+/QagIBB7MR Zcnn6HqW76i+ZuixftiAYxJD3rwHnsuguk7aVquoMPFon/e/4uGEObWjENoOXHaDBqiN +akUsn4ycaqPfAia/M8/PXJFx4yOfhORfunyUmmw7Xk7bjA+GNKQ5PeT/X62FVvKBXPm 8YvrtIRyvJ3njp4Jfb1fXIQtsMElsKPTIXu3VSxhv2Yak5v7VlQaKkePH6O2ZEbBDt3s LkVQsfGfcJ0vEVpeuyqCb4aZtmD562WTAQxrrwJpD4U3Mcp9GcFz3V6zIlnXKMS7v+qN bSmg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p29-20020aa79e9d000000b006636be3bc45si1614392pfq.120.2023.06.09.03.43.20; Fri, 09 Jun 2023 03:43:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241373AbjFIKa2 (ORCPT + 99 others); Fri, 9 Jun 2023 06:30:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238335AbjFIKaC (ORCPT ); Fri, 9 Jun 2023 06:30:02 -0400 Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 371773ABA; Fri, 9 Jun 2023 03:21:26 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R981e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0VkhlICn_1686306082; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VkhlICn_1686306082) by smtp.aliyun-inc.com; Fri, 09 Jun 2023 18:21:23 +0800 From: Jingbo Xu To: axboe@kernel.dk, hch@lst.de, linux-block@vger.kernel.org Cc: linux-kernel@vger.kernel.org, tianjia.zhang@linux.alibaba.com, xiang@kernel.org, casey@schaufler-ca.com Subject: [RFC] block: relax permission for Persistent Reservations ioctl Date: Fri, 9 Jun 2023 18:21:22 +0800 Message-Id: <20230609102122.118800-1-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768221481540365179?= X-GMAIL-MSGID: =?utf-8?q?1768221481540365179?= When the shared storage is accessed from containers [1], it's not recommended to grant CAP_SYS_ADMIN to containers for access to Persistent Reservations in risk of container escape. Remove the extra CAP_SYS_ADMIN permission constraint for Persistent Reservations ioctl which shall do no harm [2]. [1] https://lore.kernel.org/linux-block/345a7cdc-e55b-7aaa-43d4-59b3f911ef18@linux.alibaba.com/ [2] https://lore.kernel.org/linux-block/ZGxaxnOeadVwb2gR@infradead.org/ Signed-off-by: Jingbo Xu --- I also noticed that the extra CAP_SYS_ADMIN permission constraint is not added until v4 [*] of original pull request for Persistent Reservation API. [*] https://lore.kernel.org/all/1444911052-9423-1-git-send-email-hch@lst.de/ --- block/ioctl.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/block/ioctl.c b/block/ioctl.c index 9c5f637ff153..46c9ac43bbf8 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -260,8 +260,6 @@ static int blkdev_pr_register(struct block_device *bdev, const struct pr_ops *ops = bdev->bd_disk->fops->pr_ops; struct pr_registration reg; - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; if (!ops || !ops->pr_register) return -EOPNOTSUPP; if (copy_from_user(®, arg, sizeof(reg))) @@ -278,8 +276,6 @@ static int blkdev_pr_reserve(struct block_device *bdev, const struct pr_ops *ops = bdev->bd_disk->fops->pr_ops; struct pr_reservation rsv; - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; if (!ops || !ops->pr_reserve) return -EOPNOTSUPP; if (copy_from_user(&rsv, arg, sizeof(rsv))) @@ -296,8 +292,6 @@ static int blkdev_pr_release(struct block_device *bdev, const struct pr_ops *ops = bdev->bd_disk->fops->pr_ops; struct pr_reservation rsv; - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; if (!ops || !ops->pr_release) return -EOPNOTSUPP; if (copy_from_user(&rsv, arg, sizeof(rsv))) @@ -314,8 +308,6 @@ static int blkdev_pr_preempt(struct block_device *bdev, const struct pr_ops *ops = bdev->bd_disk->fops->pr_ops; struct pr_preempt p; - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; if (!ops || !ops->pr_preempt) return -EOPNOTSUPP; if (copy_from_user(&p, arg, sizeof(p))) @@ -332,8 +324,6 @@ static int blkdev_pr_clear(struct block_device *bdev, const struct pr_ops *ops = bdev->bd_disk->fops->pr_ops; struct pr_clear c; - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; if (!ops || !ops->pr_clear) return -EOPNOTSUPP; if (copy_from_user(&c, arg, sizeof(c)))