Prev: [00/67] 2.6.35.2 stable review
Next: [36/54] USB: option: add huawei k3765 k4505 devices to work properly
From: Greg KH on 11 Aug 2010 20:30
2.6.34-stable review patch. If anyone has any objections, please let us know.

------------------

From: Chris Wright <chrisw(a)sous-sol.org>

commit b7300b78d1a87625975a799a109a2f98d77757c8 upstream.

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.

Basically, the only ways to reliably allow a cgroup access to a partition
on a block device when using the whitelist are to 1) also give it access
to the whole block device or 2) make sure the partition is already open in
a different context.

The patch avoids the cgroup check for the whole disk case when opening a
partition.

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

Signed-off-by: Chris Wright <chrisw(a)sous-sol.org>
Acked-by: Serge E. Hallyn <serue(a)us.ibm.com>
Tested-by: Serge E. Hallyn <serue(a)us.ibm.com>
Reported-by: Vivek Goyal <vgoyal(a)redhat.com>
Cc: Al Viro <viro(a)ZenIV.linux.org.uk>
Cc: Christoph Hellwig <hch(a)infradead.org>
Cc: "Daniel P. Berrange" <berrange(a)redhat.com>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
fs/block_dev.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1192,10 +1192,12 @@ static int __blkdev_get(struct block_dev
/*
* 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();


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [00/67] 2.6.35.2 stable review
Next: [36/54] USB: option: add huawei k3765 k4505 devices to work properly