Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d982d5955e9033015a2cc119aa7c0a878e275964

Authored by Matt Fleming
Committed by Linus Torvalds
1 parent f6adb9a6ae
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

um: use set_current_blocked() and block_sigmask() 

As described in commit e6fa16ab9c1e ("signal: sigprocmask() should do
retarget_shared_pending()") the modification of current->blocked is
incorrect as we need to check whether the signal we're about to block is
pending in the shared queue.

Also, use the new helper function introduced in commit 5e6292c0f28f
("signal: add block_sigmask() for adding sigmask to current->blocked")
which centralises the code for updating current->blocked after
successfully delivering a signal and reduces the amount of duplicate
code across architectures.  In the past some architectures got this code
wrong, so using this helper function should stop that from happening
again.

Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: Richard Weinberger <richard@nod.at>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 6 additions and 14 deletions Side-by-side Diff

arch/um/kernel/signal.c
Diff comments   View file @ d982d59
... ... @@ -67,15 +67,8 @@
67 67  
68 68 if (err)
69 69 force_sigsegv(signr, current);
70   - else {
71   - spin_lock_irq(&current->sighand->siglock);
72   - sigorsets(&current->blocked, &current->blocked,
73   - &ka->sa.sa_mask);
74   - if (!(ka->sa.sa_flags & SA_NODEFER))
75   - sigaddset(&current->blocked, signr);
76   - recalc_sigpending();
77   - spin_unlock_irq(&current->sighand->siglock);
78   - }
  70 + else
  71 + block_sigmask(ka, signr);
79 72  
80 73 return err;
81 74 }
82 75  
... ... @@ -158,12 +151,11 @@
158 151 */
159 152 long sys_sigsuspend(int history0, int history1, old_sigset_t mask)
160 153 {
  154 + sigset_t blocked;
  155 +
161 156 mask &= _BLOCKABLE;
162   - spin_lock_irq(&current->sighand->siglock);
163   - current->saved_sigmask = current->blocked;
164   - siginitset(&current->blocked, mask);
165   - recalc_sigpending();
166   - spin_unlock_irq(&current->sighand->siglock);
  157 + siginitset(&blocked, mask);
  158 + set_current_blocked(&blocked);
167 159  
168 160 current->state = TASK_INTERRUPTIBLE;
169 161 schedule();