diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-06-23 08:30:55 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-06-23 08:30:55 -0400 |
| commit | fe6e9c1f25ac01f848bd084ee0ee62a5a0966ff3 (patch) | |
| tree | 19792926f6a7e6e50f5cf1bcfa10510943f8e3cc | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
| download | linux-fe6e9c1f25ac01f848bd084ee0ee62a5a0966ff3.tar.gz linux-fe6e9c1f25ac01f848bd084ee0ee62a5a0966ff3.tar.bz2 linux-fe6e9c1f25ac01f848bd084ee0ee62a5a0966ff3.zip | |
[PATCH] fix cgroup-inflicted breakage in block_dev.c
devcgroup_inode_permission() expects MAY_FOO, not FMODE_FOO; kindly
keep your misdesign consistent if you positively have to inflict it
on the kernel.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/block_dev.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 470c10ceb0fb..10d8a0aa871a 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -931,8 +931,16 @@ static int do_open(struct block_device *bdev, struct file *file, int for_part) struct gendisk *disk; int ret; int part; + int perm = 0; - ret = devcgroup_inode_permission(bdev->bd_inode, file->f_mode); + if (file->f_mode & FMODE_READ) + perm |= MAY_READ; + if (file->f_mode & FMODE_WRITE) + perm |= MAY_WRITE; + /* + * hooks: /n/, see "layering violations". + */ + ret = devcgroup_inode_permission(bdev->bd_inode, perm); if (ret != 0) return ret; |