diff options
| author | Niklas Cassel <niklas.cassel@wdc.com> | 2021-08-11 11:05:18 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-22 11:45:24 +0200 |
| commit | 1373db0a8518b2addabd144b7e5de8f1e21f5be6 (patch) | |
| tree | 924422557a07b9489fb35d656fa12122c31da7f8 | |
| parent | fe6cdaa9ad3c8bae5829bbc52aa1b0871d91b0fd (diff) | |
| download | linux-stable-1373db0a8518b2addabd144b7e5de8f1e21f5be6.tar.gz linux-stable-1373db0a8518b2addabd144b7e5de8f1e21f5be6.tar.bz2 linux-stable-1373db0a8518b2addabd144b7e5de8f1e21f5be6.zip | |
blk-zoned: allow zone management send operations without CAP_SYS_ADMIN
commit ead3b768bb51259e3a5f2287ff5fc9041eb6f450 upstream.
Zone management send operations (BLKRESETZONE, BLKOPENZONE, BLKCLOSEZONE
and BLKFINISHZONE) should be allowed under the same permissions as write().
(write() does not require CAP_SYS_ADMIN).
Additionally, other ioctls like BLKSECDISCARD and BLKZEROOUT only check if
the fd was successfully opened with FMODE_WRITE.
(They do not require CAP_SYS_ADMIN).
Currently, zone management send operations require both CAP_SYS_ADMIN
and that the fd was successfully opened with FMODE_WRITE.
Remove the CAP_SYS_ADMIN requirement, so that zone management send
operations match the access control requirement of write(), BLKSECDISCARD
and BLKZEROOUT.
Fixes: 3ed05a987e0f ("blk-zoned: implement ioctls")
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Aravind Ramesh <aravind.ramesh@wdc.com>
Reviewed-by: Adam Manzanares <a.manzanares@samsung.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Cc: stable@vger.kernel.org # v4.10+
Link: https://lore.kernel.org/r/20210811110505.29649-2-Niklas.Cassel@wdc.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | block/blk-zoned.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/block/blk-zoned.c b/block/blk-zoned.c index 77fce6f09f78..9d0be59140d5 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -338,9 +338,6 @@ int blkdev_reset_zones_ioctl(struct block_device *bdev, fmode_t mode, if (!blk_queue_is_zoned(q)) return -ENOTTY; - if (!capable(CAP_SYS_ADMIN)) - return -EACCES; - if (!(mode & FMODE_WRITE)) return -EBADF; |