diff options
Diffstat (limited to 'ipc/mqueue.c')
-rw-r--r-- | ipc/mqueue.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 6ca7b97114f3..60f7a27f7a9e 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
@@ -332,8 +332,7 @@ static ssize_t mqueue_read_file(struct file *filp, char __user *u_data, | |||
332 | (info->notify_owner && | 332 | (info->notify_owner && |
333 | info->notify.sigev_notify == SIGEV_SIGNAL) ? | 333 | info->notify.sigev_notify == SIGEV_SIGNAL) ? |
334 | info->notify.sigev_signo : 0, | 334 | info->notify.sigev_signo : 0, |
335 | pid_nr_ns(info->notify_owner, | 335 | pid_vnr(info->notify_owner)); |
336 | current->nsproxy->pid_ns)); | ||
337 | spin_unlock(&info->lock); | 336 | spin_unlock(&info->lock); |
338 | buffer[sizeof(buffer)-1] = '\0'; | 337 | buffer[sizeof(buffer)-1] = '\0'; |
339 | slen = strlen(buffer)+1; | 338 | slen = strlen(buffer)+1; |
@@ -510,7 +509,7 @@ static void __do_notify(struct mqueue_inode_info *info) | |||
510 | sig_i.si_errno = 0; | 509 | sig_i.si_errno = 0; |
511 | sig_i.si_code = SI_MESGQ; | 510 | sig_i.si_code = SI_MESGQ; |
512 | sig_i.si_value = info->notify.sigev_value; | 511 | sig_i.si_value = info->notify.sigev_value; |
513 | sig_i.si_pid = task_pid_vnr(current); | 512 | sig_i.si_pid = task_tgid_vnr(current); |
514 | sig_i.si_uid = current->uid; | 513 | sig_i.si_uid = current->uid; |
515 | 514 | ||
516 | kill_pid_info(info->notify.sigev_signo, | 515 | kill_pid_info(info->notify.sigev_signo, |