2 files changed, 6 insertions, 4 deletions

diff --git a/block/ioprio.c b/block/ioprio.c
index 31666c92b46a..cc7800e9eb44 100644
--- a/block/ioprio.c
+++ b/block/ioprio.c
@@ -123,7 +123,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which, int, who, int, ioprio)
                                 break;
 
                         do_each_thread(g, p) {
-                                if (!uid_eq(task_uid(p), uid))
+                                if (!uid_eq(task_uid(p), uid) ||
+                                    !task_pid_vnr(p))
                                         continue;
                                 ret = set_task_ioprio(p, ioprio);
                                 if (ret)
@@ -220,7 +221,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, int, who)
                                 break;
 
                         do_each_thread(g, p) {
-                                if (!uid_eq(task_uid(p), user->uid))
+                                if (!uid_eq(task_uid(p), user->uid) ||
+                                    !task_pid_vnr(p))
                                         continue;
                                 tmpio = get_task_ioprio(p);
                                 if (tmpio < 0)
diff --git a/kernel/sys.c b/kernel/sys.c
index fa2f2f671a5c..6af9212ab5aa 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -222,7 +222,7 @@ SYSCALL_DEFINE3(setpriority, int, which, int, who, int, niceval)
                                 goto out_unlock;        /* No processes for this user */
                 }
                 do_each_thread(g, p) {
-                        if (uid_eq(task_uid(p), uid))
+                        if (uid_eq(task_uid(p), uid) && task_pid_vnr(p))
                                 error = set_one_prio(p, niceval, error);
                 } while_each_thread(g, p);
                 if (!uid_eq(uid, cred->uid))
@@ -290,7 +290,7 @@ SYSCALL_DEFINE2(getpriority, int, which, int, who)
                                 goto out_unlock;        /* No processes for this user */
                 }
                 do_each_thread(g, p) {
-                        if (uid_eq(task_uid(p), uid)) {
+                        if (uid_eq(task_uid(p), uid) && task_pid_vnr(p)) {
                                 niceval = nice_to_rlimit(task_nice(p));
                                 if (niceval > retval)
                                         retval = niceval;