diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-24 02:24:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-24 02:24:53 -0700 |
| commit | f65013d655ac9639f37d3b54189f6468f672e60b (patch) | |
| tree | 395f8f44cada4613934e309491421b0701e03613 /crypto | |
| parent | 94a6df251dd08c6436ebd6d10c68f03659148ce1 (diff) | |
| parent | 57db7e4a2d92c2d3dfbca4ef8057849b2682436b (diff) | |
| download | linux-f65013d655ac9639f37d3b54189f6468f672e60b.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull timer fix from Eric Biederman:
"This fixes an issue of confusing injected signals with the signals
from posix timers that has existed since posix timers have been in the
kernel.
This patch is slightly simpler than my earlier version of this patch
as I discovered in testing that I had misspelled "#ifdef
CONFIG_POSIX_TIMERS". So I deleted that unnecessary test and made
setting of resched_timer uncondtional.
I have tested this and verified that without this patch there is a
nasty hang that is easy to trigger, and with this patch everything
works properly"
Thomas Gleixner dixit:
"It fixes the problem at hand and covers the ptrace case as well, which
I missed.
Reviewed-and-tested-by: Thomas Gleixner <tglx@linutronix.de>"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
signal: Only reschedule timers on signals timers have sent
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions