summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerge E. Hallyn <serue@us.ibm.com>2009-01-07 18:07:46 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-08 08:31:03 -0800
commit0b82ac37b889ec881b645860da3775118effb3ca (patch)
tree93407311725ac2588df5f37e261304a51064e200
parent116e05751285c20edf5768ca3bcc00dad86181bb (diff)
downloadblackbird-op-linux-0b82ac37b889ec881b645860da3775118effb3ca.tar.gz
blackbird-op-linux-0b82ac37b889ec881b645860da3775118effb3ca.zip
devices cgroup: allow mkfifo
The devcgroup_inode_permission() hook in the devices whitelist cgroup has always bypassed access checks on fifos. But the mknod hook did not. The devices whitelist is only about block and char devices, and fifos can't even be added to the whitelist, so fifos can't be created at all except by tasks which have 'a' in their whitelist (meaning they have access to all devices). Fix the behavior by bypassing access checks to mkfifo. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Cc: Li Zefan <lizf@cn.fujitsu.com> Cc: Pavel Emelyanov <xemul@openvz.org> Cc: Paul Menage <menage@google.com> Cc: Lai Jiangshan <laijs@cn.fujitsu.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: James Morris <jmorris@namei.org> Reported-by: Daniel Lezcano <dlezcano@fr.ibm.com> Cc: <stable@kernel.org> [2.6.27.x] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--security/device_cgroup.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index cd377b9082b5..3aacd0fe7179 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -513,6 +513,9 @@ int devcgroup_inode_mknod(int mode, dev_t dev)
struct dev_cgroup *dev_cgroup;
struct dev_whitelist_item *wh;
+ if (!S_ISBLK(mode) && !S_ISCHR(mode))
+ return 0;
+
rcu_read_lock();
dev_cgroup = task_devcgroup(current);
OpenPOWER on IntegriCloud