summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2008-08-05 16:14:09 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-08-20 11:15:40 -0700
commit38f6a47d3889def2a4d87e4f8b636fa7cf14cac4 (patch)
tree361a3dac02e29980bf897e5a4f1d1366ad6722f4
parent4b09fd1b359a42f910881feca140ae0bf3efb28e (diff)
downloadlwn-38f6a47d3889def2a4d87e4f8b636fa7cf14cac4.tar.gz
lwn-38f6a47d3889def2a4d87e4f8b636fa7cf14cac4.zip
uml: stub needs to tolerate SIGWINCH
commit 3d5ede6f776bdb1483bcd086f79c3bf41fed3865 upstream We lost the marking of SIGWINCH as being OK to receive during stub execution, causing a panic should that happen. Cc: Benedict Verheyen <benedict.verheyen@gmail.com> Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--arch/um/os-Linux/skas/process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index 1e8cba6550a9..2328098f8c3a 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -55,7 +55,7 @@ static int ptrace_dump_regs(int pid)
* Signals that are OK to receive in the stub - we'll just continue it.
* SIGWINCH will happen when UML is inside a detached screen.
*/
-#define STUB_SIG_MASK (1 << SIGVTALRM)
+#define STUB_SIG_MASK ((1 << SIGVTALRM) | (1 << SIGWINCH))
/* Signals that the stub will finish with - anything else is an error */
#define STUB_DONE_MASK (1 << SIGTRAP)