tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'ceph-for-5.9-rc5' of git://github.com/ceph/ceph-client

Pull ceph fix from Ilya Dryomov:
"Add missing capability checks in rbd, marked for stable"

* tag 'ceph-for-5.9-rc5' of git://github.com/ceph/ceph-client:
rbd: require global CAP_SYS_ADMIN for mapping and unmapping

Linus Torvalds 729e3d09 e9287bd2

+12
+12
drivers/block/rbd.c
··· 5120 5120 { 5121 5121 struct rbd_device *rbd_dev = dev_to_rbd_dev(dev); 5122 5122 5123 + if (!capable(CAP_SYS_ADMIN)) 5124 + return -EPERM; 5125 + 5123 5126 return sprintf(buf, "%s\n", rbd_dev->config_info); 5124 5127 } 5125 5128 ··· 5233 5230 { 5234 5231 struct rbd_device *rbd_dev = dev_to_rbd_dev(dev); 5235 5232 int ret; 5233 + 5234 + if (!capable(CAP_SYS_ADMIN)) 5235 + return -EPERM; 5236 5236 5237 5237 ret = rbd_dev_refresh(rbd_dev); 5238 5238 if (ret) ··· 7065 7059 struct rbd_client *rbdc; 7066 7060 int rc; 7067 7061 7062 + if (!capable(CAP_SYS_ADMIN)) 7063 + return -EPERM; 7064 + 7068 7065 if (!try_module_get(THIS_MODULE)) 7069 7066 return -ENODEV; 7070 7067 ··· 7217 7208 char opt_buf[6]; 7218 7209 bool force = false; 7219 7210 int ret; 7211 + 7212 + if (!capable(CAP_SYS_ADMIN)) 7213 + return -EPERM; 7220 7214 7221 7215 dev_id = -1; 7222 7216 opt_buf[0] = '\0';