From 26c13b552b9b4845f68390bc9b5d526ca9a365c9 Mon Sep 17 00:00:00 2001
From: "Serge E. Hallyn" <serue@us.ibm.com>
Date: Wed, 7 Jan 2009 18:07:46 -0800
Subject: [PATCH] --- yaml --- r: 127554 b: refs/heads/master c:
 0b82ac37b889ec881b645860da3775118effb3ca h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/security/device_cgroup.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 939830683428..515a87bf5bf3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 116e05751285c20edf5768ca3bcc00dad86181bb
+refs/heads/master: 0b82ac37b889ec881b645860da3775118effb3ca
diff --git a/trunk/security/device_cgroup.c b/trunk/security/device_cgroup.c
index cd377b9082b5..3aacd0fe7179 100644
--- a/trunk/security/device_cgroup.c
+++ b/trunk/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);