Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: G7MaAz7U9CQjqPfNhCeAy0QrbyVAX4dS/lHBIUCWeQNSGeGfE123NceZVrtFu20rPF/C67pZaR
 M874PjWBUSpA4scsR27+fv5n/KaME+oejwnPfoD6f2qzCXdiBVRXkUQAa7bd2TbRv//bRAfB3D
 iKUb+d+5r5wA9fDItbAhGf2TJd6MPToiqSlkxZxc8HnrWbsaxsc6Bd3ZXTXPA8F0ot3WrmOd3Q
 TZMaWN3eoyXAfuct6YtM9YWbhiJzznXc3cD4BMleY3u1LpkhI4co5NFQwIXsC9m4Ni7XK8uBVv
 Nuo=
From:   Niklas Cassel <Niklas.Cassel@wdc.com>
To:     Jens Axboe <axboe@kernel.dk>
CC:     Damien Le Moal <Damien.LeMoal@wdc.com>,
        Niklas Cassel <Niklas.Cassel@wdc.com>,
        "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH 2/2] blk-zoned: allow BLKREPORTZONE without CAP_SYS_ADMIN
Thread-Topic: [PATCH 2/2] blk-zoned: allow BLKREPORTZONE without CAP_SYS_ADMIN
Thread-Index: AQHXViSH/N9K56jFnkyIxAVcrCvP9Q==
Date:   Mon, 31 May 2021 13:54:53 +0000
Message-ID: <20210531135444.122018-3-Niklas.Cassel@wdc.com>
References: <20210531135444.122018-1-Niklas.Cassel@wdc.com>
In-Reply-To: <20210531135444.122018-1-Niklas.Cassel@wdc.com>
Accept-Language: en-US
Content-Language: en-US
wdcipoutbound: EOP-TRUE
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: e6e6cd9f-f0ef-42ab-72e5-08d9243baa8f
X-MS-Exchange-CrossTenant-originalarrivaltime: 31 May 2021 13:54:53.0892
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 6yj1xYxyhnlFEs1TQO6XkgCzPahLrR1Ftxd8HmYhJh4nLDrYOLg8L0Yt4dVTd8ceiyatCf+b5xBZq/E1TyFLZw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR04MB7349
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Niklas Cassel <niklas.cassel@wdc.com>

Performing a BLKREPORTZONE operation should be allowed under the same
permissions as read(). (read() does not require CAP_SYS_ADMIN).

Remove the CAP_SYS_ADMIN requirement, and instead check that the fd was
successfully opened with FMODE_READ. This way BLKREPORTZONE will match
the access control requirement of read().

Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
---
 block/blk-zoned.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 0789e6e9f7db..e05fe8dbb06d 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -288,8 +288,8 @@ int blkdev_report_zones_ioctl(struct block_device *bdev=
, fmode_t mode,
 	if (!blk_queue_is_zoned(q))
 		return -ENOTTY;
=20
-	if (!capable(CAP_SYS_ADMIN))
-		return -EACCES;
+	if (!(mode & FMODE_READ))
+		return -EBADF;
=20
 	if (copy_from_user(&rep, argp, sizeof(struct blk_zone_report)))
 		return -EFAULT;
--=20
2.31.1