Module Name: src
Committed By: christos
Date: Sun Jan 7 21:14:38 UTC 2018
Modified Files:
src/sys/compat/linux/common: linux_sigaction.c linux_signal.c
Log Message:
Ignore signal 64 for now (go uses it)
XXX: pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/linux/common/linux_sigaction.c
cvs rdiff -u -r1.79 -r1.80 src/sys/compat/linux/common/linux_signal.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_sigaction.c
diff -u src/sys/compat/linux/common/linux_sigaction.c:1.34 src/sys/compat/linux/common/linux_sigaction.c:1.35
--- src/sys/compat/linux/common/linux_sigaction.c:1.34 Fri Oct 17 16:21:34 2008
+++ src/sys/compat/linux/common/linux_sigaction.c Sun Jan 7 16:14:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sigaction.c,v 1.34 2008/10/17 20:21:34 njoly Exp $ */
+/* $NetBSD: linux_sigaction.c,v 1.35 2018/01/07 21:14:38 christos Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sigaction.c,v 1.34 2008/10/17 20:21:34 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sigaction.c,v 1.35 2018/01/07 21:14:38 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,6 +84,15 @@ linux_sys_sigaction(struct lwp *l, const
linux_old_to_native_sigaction(&nbsa, &nlsa);
}
sig = SCARG(uap, signum);
+ /*
+ * XXX: Linux has 33 realtime signals, the go binary wants to
+ * reset all of them; nothing else uses the last RT signal, so for
+ * now ignore it.
+ */
+ if (sig == LINUX__NSIG) {
+ uprintf("%s: setting signal %d ignored\n", __func__, sig);
+ sig--; /* back to 63 which is ignored */
+ }
if (sig < 0 || sig >= LINUX__NSIG)
return (EINVAL);
if (sig > 0 && !linux_to_native_signo[sig]) {
Index: src/sys/compat/linux/common/linux_signal.c
diff -u src/sys/compat/linux/common/linux_signal.c:1.79 src/sys/compat/linux/common/linux_signal.c:1.80
--- src/sys/compat/linux/common/linux_signal.c:1.79 Mon Feb 20 11:30:41 2017
+++ src/sys/compat/linux/common/linux_signal.c Sun Jan 7 16:14:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_signal.c,v 1.79 2017/02/20 16:30:41 rin Exp $ */
+/* $NetBSD: linux_signal.c,v 1.80 2018/01/07 21:14:38 christos Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.79 2017/02/20 16:30:41 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.80 2018/01/07 21:14:38 christos Exp $");
#define COMPAT_LINUX 1
@@ -346,6 +346,15 @@ linux_sys_rt_sigaction(struct lwp *l, co
}
sig = SCARG(uap, signum);
+ /*
+ * XXX: Linux has 33 realtime signals, the go binary wants to
+ * reset all of them; nothing else uses the last RT signal, so for
+ * now ignore it.
+ */
+ if (sig == LINUX__NSIG) {
+ uprintf("%s: setting signal %d ignored\n", __func__, sig);
+ sig--; /* back to 63 which is ignored */
+ }
if (sig < 0 || sig >= LINUX__NSIG)
return EINVAL;
if (sig > 0 && !linux_to_native_signo[sig]) {
