From 7d92d34ee4c7988f5ef6c8a5ed23d2c3e0837253 Mon Sep 17 00:00:00 2001 From: Timothy E Baldwin Date: Fri, 27 May 2016 15:51:58 +0100 Subject: linux-user: Restart fork() if signals pending If there is a signal pending during fork() the signal handler will erroneously be called in both the parent and child, so handle any pending signals first. Signed-off-by: Timothy Edward Baldwin Message-id: 1441497448-32489-20-git-send-email-T.E.Baldwin99@members.leeds.ac.uk Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/syscall.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'linux-user') diff --git a/linux-user/syscall.c b/linux-user/syscall.c index c0d086c2fb..a2d591ed8a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5437,6 +5437,11 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp, if ((flags & ~(CSIGNAL | CLONE_NPTL_FLAGS2)) != 0) { return -TARGET_EINVAL; } + + if (block_signals()) { + return -TARGET_ERESTARTSYS; + } + fork_start(); ret = fork(); if (ret == 0) { -- cgit v1.2.1