Skip to content

Commit

Permalink
rbd: require global CAP_SYS_ADMIN for mapping and unmapping
Browse files Browse the repository at this point in the history
It turns out that currently we rely only on sysfs attribute
permissions:

  $ ll /sys/bus/rbd/{add*,remove*}
  --w------- 1 root root 4096 Sep  3 20:37 /sys/bus/rbd/add
  --w------- 1 root root 4096 Sep  3 20:37 /sys/bus/rbd/add_single_major
  --w------- 1 root root 4096 Sep  3 20:37 /sys/bus/rbd/remove
  --w------- 1 root root 4096 Sep  3 20:38 /sys/bus/rbd/remove_single_major

This means that images can be mapped and unmapped (i.e. block devices
can be created and deleted) by a UID 0 process even after it drops all
privileges or by any process with CAP_DAC_OVERRIDE in its user namespace
as long as UID 0 is mapped into that user namespace.

Be consistent with other virtual block devices (loop, nbd, dm, md, etc)
and require CAP_SYS_ADMIN in the initial user namespace for mapping and
unmapping, and also for dumping the configuration string and refreshing
the image header.

Cc: [email protected]
Signed-off-by: Ilya Dryomov <[email protected]>
Reviewed-by: Jeff Layton <[email protected]>
  • Loading branch information
idryomov committed Sep 7, 2020
1 parent f4d51df commit f44d04e
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions drivers/block/rbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -5120,6 +5120,9 @@ static ssize_t rbd_config_info_show(struct device *dev,
{
struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);

if (!capable(CAP_SYS_ADMIN))
return -EPERM;

return sprintf(buf, "%s\n", rbd_dev->config_info);
}

Expand Down Expand Up @@ -5231,6 +5234,9 @@ static ssize_t rbd_image_refresh(struct device *dev,
struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);
int ret;

if (!capable(CAP_SYS_ADMIN))
return -EPERM;

ret = rbd_dev_refresh(rbd_dev);
if (ret)
return ret;
Expand Down Expand Up @@ -7059,6 +7065,9 @@ static ssize_t do_rbd_add(struct bus_type *bus,
struct rbd_client *rbdc;
int rc;

if (!capable(CAP_SYS_ADMIN))
return -EPERM;

if (!try_module_get(THIS_MODULE))
return -ENODEV;

Expand Down Expand Up @@ -7209,6 +7218,9 @@ static ssize_t do_rbd_remove(struct bus_type *bus,
bool force = false;
int ret;

if (!capable(CAP_SYS_ADMIN))
return -EPERM;

dev_id = -1;
opt_buf[0] = '\0';
sscanf(buf, "%d %5s", &dev_id, opt_buf);
Expand Down

0 comments on commit f44d04e

Please sign in to comment.