2 files changed, 7 insertions, 9 deletions

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index c16d00e53264..13c65dd2d37d 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1222,9 +1222,6 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file,
         struct fuse_in *in;
         unsigned reqsize;
 
-        if (task_active_pid_ns(current) != fc->pid_ns)
-                return -EIO;
-
  restart:
         spin_lock(&fiq->waitq.lock);
         err = -EAGAIN;
@@ -1262,6 +1259,13 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file,
 
         in = &req->in;
         reqsize = in->h.len;
+
+        if (task_active_pid_ns(current) != fc->pid_ns) {
+                rcu_read_lock();
+                in->h.pid = pid_vnr(find_pid_ns(in->h.pid, fc->pid_ns));
+                rcu_read_unlock();
+        }
+
         /* If request is too large, reply with an error and restart the read */
         if (nbytes < reqsize) {
                 req->out.h.error = -EIO;
@@ -1823,9 +1827,6 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud,
         struct fuse_req *req;
         struct fuse_out_header oh;
 
-        if (task_active_pid_ns(current) != fc->pid_ns)
-                return -EIO;
-
         if (nbytes < sizeof(struct fuse_out_header))
                 return -EINVAL;
 
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index ab60051be6e5..6d8e65cec01a 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2181,9 +2181,6 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
         if ((fl->fl_flags & FL_CLOSE_POSIX) == FL_CLOSE_POSIX)
                 return 0;
 
-        if (pid && pid_nr == 0)
-                return -EOVERFLOW;
-
         fuse_lk_fill(&args, file, fl, opcode, pid_nr, flock, &inarg);
         err = fuse_simple_request(fc, &args);