[CVE-2009-0029] System call wrappers part 02

[karo-tx-linux.git] / kernel / signal.c

diff --git a/kernel/signal.c b/kernel/signal.c
index 8e95855ff3cf8c93fe10540110172fe484b8b01b..856a5479d49d6a34d81adf6ea597169d93a42dc1 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -858,7 +858,8 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
                        q->info.si_signo = sig;
                        q->info.si_errno = 0;
                        q->info.si_code = SI_USER;
-                       q->info.si_pid = task_pid_vnr(current);
+                       q->info.si_pid = task_tgid_nr_ns(current,
+                                                       task_active_pid_ns(t));
                        q->info.si_uid = current_uid();
                        break;
                case (unsigned long) SEND_SIG_PRIV:
@@ -2558,7 +2559,7 @@ sys_ssetmask(int newmask)
 /*
  * For backwards compatibility.  Functionality superseded by sigaction.
  */
-asmlinkage unsigned long
+asmlinkage long
 sys_signal(int sig, __sighandler_t handler)
 {
        struct k_sigaction new_sa, old_sa;