Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

[karo-tx-linux.git] / fs / coda / psdev.c

diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index 761d5b31b18d0b27ce83d6d7ed7a815d3e63b75d..ebc2bae6c289038803f4542f88fc8291c5006c8d 100644 (file)
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -37,6 +37,7 @@
 #include <linux/list.h>
 #include <linux/mutex.h>
 #include <linux/device.h>
+#include <linux/pid_namespace.h>
 #include <asm/io.h>
 #include <asm/poll.h>
 #include <asm/uaccess.h>
@@ -266,6 +267,12 @@ static int coda_psdev_open(struct inode * inode, struct file * file)
        struct venus_comm *vcp;
        int idx, err;
 
+       if (task_active_pid_ns(current) != &init_pid_ns)
+               return -EINVAL;
+
+       if (current_user_ns() != &init_user_ns)
+               return -EINVAL;
+
        idx = iminor(inode);
        if (idx < 0 || idx >= MAX_CODADEVS)
                return -ENODEV;