Skip to contentSkip to conversation

blkdev: cgroup whitelist permission fix

PATCH In review Chris Wright 2 participants 2 messages May 14, 2010 – May 18, 2010 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 blkdev: cgroup whitelist permission fix

The cgroup device whitelist code gets confused when trying to grant permission to a disk partition that is not currently open. Part of blkdev_open() includes __blkdev_get() on the whole disk. This simply avoids the cgroup check for the whole disk case when opening a partition.

https://bugzilla.redhat.com/show_bug.cgi?id=589662

---
 fs/block_dev.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
fs/block_dev.c +6 -4
index 6dcee88..d4d19ac 100644
@@ -1192,10 +1192,12 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
 	/*
 	 * hooks: /n/, see "layering violations".
 	 */
-	ret = devcgroup_inode_permission(bdev->bd_inode, perm);
-	if (ret != 0) {
-		bdput(bdev);
-		return ret;
+	if (!for_part) {
+		ret = devcgroup_inode_permission(bdev->bd_inode, perm);
+		if (ret != 0) {
+			bdput(bdev);
+			return ret;
+		}
 	}
 
 	lock_kernel();
Acked-by Tested-by on v1 1/1
#1 lore raw
Quoted 9 lines · Chris Wright

The cgroup device whitelist code gets confused when trying to grant permission to a disk partition that is not currently open. Part of blkdev_open() includes __blkdev_get() on the whole disk. This simply avoids the cgroup check for the whole disk case when opening a partition.

https://bugzilla.redhat.com/show_bug.cgi?id=589662

Thanks, Chris, sorry for the delay.

Quoted 25 lines
---
 fs/block_dev.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
fs/block_dev.c +6 -4
index 6dcee88..d4d19ac 100644
@@ -1192,10 +1192,12 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
 	/*
 	 * hooks: /n/, see "layering violations".
 	 */
-	ret = devcgroup_inode_permission(bdev->bd_inode, perm);
-	if (ret != 0) {
-		bdput(bdev);
-		return ret;
+	if (!for_part) {
+		ret = devcgroup_inode_permission(bdev->bd_inode, perm);
+		if (ret != 0) {
+			bdput(bdev);
+			return ret;
+		}
 	}
 
 	lock_kernel();