Commit 9d8a7652 authored Nov 20, 2015 by Richard Weinberger Committed by Linus Torvalds Nov 20, 2015

kernel/signal.c: unexport sigsuspend()



sigsuspend() is nowhere used except in signal.c itself, so we can mark it
static do not pollute the global namespace.

But this patch is more than a boring cleanup patch, it fixes a real issue
on UserModeLinux.  UML has a special console driver to display ttys using
xterm, or other terminal emulators, on the host side.  Vegard reported
that sometimes UML is unable to spawn a xterm and he's facing the
following warning:

  WARNING: CPU: 0 PID: 908 at include/linux/thread_info.h:128 sigsuspend+0xab/0xc0()

It turned out that this warning makes absolutely no sense as the UML
xterm code calls sigsuspend() on the host side, at least it tries.  But
as the kernel itself offers a sigsuspend() symbol the linker choose this
one instead of the glibc wrapper.  Interestingly this code used to work
since ever but always blocked signals on the wrong side.  Some recent
kernel change made the WARN_ON() trigger and uncovered the bug.

It is a wonderful example of how much works by chance on computers. :-)

Fixes: 68f3f16d ("new helper: sigsuspend()")
Signed-off-by: Richard Weinberger <richard@nod.at>
Reported-by: Vegard Nossum <vegard.nossum@oracle.com>
Tested-by: Vegard Nossum <vegard.nossum@oracle.com>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Cc: <stable@vger.kernel.org>	[3.5+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 45937254

include/linux/signal.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -239,7 +239,6 @@ extern int sigprocmask(int, sigset_t , sigset_t );
		extern void set_current_blocked(sigset_t *);
		extern void __set_current_blocked(const sigset_t *);
		extern int show_unhandled_signals;
		extern int sigsuspend(sigset_t *);

		struct sigaction {
		#ifndef __ARCH_HAS_IRIX_SIGACTION

kernel/signal.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3503,7 +3503,7 @@ SYSCALL_DEFINE0(pause)

		#endif

		int sigsuspend(sigset_t *set)
		static int sigsuspend(sigset_t *set)
		{
		current->saved_sigmask = current->blocked;
		set_current_blocked(set);

Admin message