Merge branch 'linus' into release

1 files changed, 20 insertions, 20 deletions

diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index a140e44eebba..887c63787de6 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -116,7 +116,7 @@ static DEFINE_SPINLOCK(idr_lock);
  *          must supply functions here, even if the function just returns
  *          ENOSYS.  The standard POSIX timer management code assumes the
  *          following: 1.) The k_itimer struct (sched.h) is used for the
- *          timer.  2.) The list, it_lock, it_clock, it_id and it_process
+ *          timer.  2.) The list, it_lock, it_clock, it_id and it_pid
  *          fields are not modified by timer code.
  *
  *          At this time all functions EXCEPT clock_nanosleep can be
@@ -319,7 +319,8 @@ void do_schedule_next_timer(struct siginfo *info)
 
 int posix_timer_event(struct k_itimer *timr, int si_private)
 {
-        int shared, ret;
+        struct task_struct *task;
+        int shared, ret = -1;
         /*
          * FIXME: if ->sigq is queued we can race with
          * dequeue_signal()->do_schedule_next_timer().
@@ -333,8 +334,13 @@ int posix_timer_event(struct k_itimer *timr, int si_private)
          */
         timr->sigq->info.si_sys_private = si_private;
 
-        shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID);
-        ret = send_sigqueue(timr->sigq, timr->it_process, shared);
+        rcu_read_lock();
+        task = pid_task(timr->it_pid, PIDTYPE_PID);
+        if (task) {
+                shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID);
+                ret = send_sigqueue(timr->sigq, task, shared);
+        }
+        rcu_read_unlock();
         /* If we failed to send the signal the timer stops. */
         return ret > 0;
 }
@@ -411,7 +417,7 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer)
         return ret;
 }
 
-static struct task_struct * good_sigevent(sigevent_t * event)
+static struct pid *good_sigevent(sigevent_t * event)
 {
         struct task_struct *rtn = current->group_leader;
 
@@ -425,7 +431,7 @@ static struct task_struct * good_sigevent(sigevent_t * event)
             ((event->sigev_signo <= 0) || (event->sigev_signo > SIGRTMAX)))
                 return NULL;
 
-        return rtn;
+        return task_pid(rtn);
 }
 
 void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock)
@@ -464,6 +470,7 @@ static void release_posix_timer(struct k_itimer *tmr, int it_id_set)
                 idr_remove(&posix_timers_id, tmr->it_id);
                 spin_unlock_irqrestore(&idr_lock, flags);
         }
+        put_pid(tmr->it_pid);
         sigqueue_free(tmr->sigq);
         kmem_cache_free(posix_timers_cache, tmr);
 }
@@ -477,7 +484,6 @@ sys_timer_create(const clockid_t which_clock,
 {
         struct k_itimer *new_timer;
         int error, new_timer_id;
-        struct task_struct *process;
         sigevent_t event;
         int it_id_set = IT_ID_NOT_SET;
 
@@ -531,11 +537,9 @@ sys_timer_create(const clockid_t which_clock,
                         goto out;
                 }
                 rcu_read_lock();
-                process = good_sigevent(&event);
-                if (process)
-                        get_task_struct(process);
+                new_timer->it_pid = get_pid(good_sigevent(&event));
                 rcu_read_unlock();
-                if (!process) {
+                if (!new_timer->it_pid) {
                         error = -EINVAL;
                         goto out;
                 }
@@ -543,8 +547,7 @@ sys_timer_create(const clockid_t which_clock,
                 event.sigev_notify = SIGEV_SIGNAL;
                 event.sigev_signo = SIGALRM;
                 event.sigev_value.sival_int = new_timer->it_id;
-                process = current->group_leader;
-                get_task_struct(process);
+                new_timer->it_pid = get_pid(task_tgid(current));
         }
 
         new_timer->it_sigev_notify     = event.sigev_notify;
@@ -554,7 +557,7 @@ sys_timer_create(const clockid_t which_clock,
         new_timer->sigq->info.si_code  = SI_TIMER;
 
         spin_lock_irq(&current->sighand->siglock);
-        new_timer->it_process = process;
+        new_timer->it_signal = current->signal;
         list_add(&new_timer->list, &current->signal->posix_timers);
         spin_unlock_irq(&current->sighand->siglock);
 
@@ -589,8 +592,7 @@ static struct k_itimer *lock_timer(timer_t timer_id, unsigned long *flags)
         timr = idr_find(&posix_timers_id, (int)timer_id);
         if (timr) {
                 spin_lock(&timr->it_lock);
-                if (timr->it_process &&
-                    same_thread_group(timr->it_process, current)) {
+                if (timr->it_signal == current->signal) {
                         spin_unlock(&idr_lock);
                         return timr;
                 }
@@ -837,8 +839,7 @@ retry_delete:
          * This keeps any tasks waiting on the spin lock from thinking
          * they got something (see the lock code above).
          */
-        put_task_struct(timer->it_process);
-        timer->it_process = NULL;
+        timer->it_signal = NULL;
 
         unlock_timer(timer, flags);
         release_posix_timer(timer, IT_ID_SET);
@@ -864,8 +865,7 @@ retry_delete:
          * This keeps any tasks waiting on the spin lock from thinking
          * they got something (see the lock code above).
          */
-        put_task_struct(timer->it_process);
-        timer->it_process = NULL;
+        timer->it_signal = NULL;
 
         unlock_timer(timer, flags);
         release_posix_timer(timer, IT_ID_SET);