Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use __SIGTRAMP_SIGCODE_VERSION rather than hard-coding 0.

This commit is contained in:
thorpej 2021-10-27 16:40:04 +00:00
parent bf8d193b05
commit 38baf0b8de
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/compat/linux/arch/amd64/linux_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_machdep.c,v 1.60 2021/09/07 11:43:03 riastradh Exp $ */ /* $NetBSD: linux_machdep.c,v 1.61 2021/10/27 16:40:04 thorpej Exp $ */
/*- /*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@ -33,7 +33,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.60 2021/09/07 11:43:03 riastradh Exp $"); __KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.61 2021/10/27 16:40:04 thorpej Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h> #include <sys/types.h>
@ -167,7 +167,7 @@ linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
sfp = (struct linux_rt_sigframe *)sp; sfp = (struct linux_rt_sigframe *)sp;
memset(&sigframe, 0, sizeof(sigframe)); memset(&sigframe, 0, sizeof(sigframe));
if (ps->sa_sigdesc[sig].sd_vers != 0) if (ps->sa_sigdesc[sig].sd_vers != __SIGTRAMP_SIGCODE_VERSION)
sigframe.pretcode = sigframe.pretcode =
(char *)(u_long)ps->sa_sigdesc[sig].sd_tramp; (char *)(u_long)ps->sa_sigdesc[sig].sd_tramp;
else else

6
sys/compat/linux/common/linux_signal.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_signal.c,v 1.86 2021/09/23 06:56:27 ryo Exp $ */ /* $NetBSD: linux_signal.c,v 1.87 2021/10/27 16:40:05 thorpej Exp $ */
/*- /*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@ -48,7 +48,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.86 2021/09/23 06:56:27 ryo Exp $"); __KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.87 2021/10/27 16:40:05 thorpej Exp $");
#define COMPAT_LINUX 1 #define COMPAT_LINUX 1
@ -391,7 +391,7 @@ linux_sys_rt_sigaction(struct lwp *l, const struct linux_sys_rt_sigaction_args *
native_to_linux_sigaction(&olsa, &obsa); native_to_linux_sigaction(&olsa, &obsa);
#ifdef LINUX_SA_RESTORER #ifdef LINUX_SA_RESTORER
if (ps->sa_sigdesc[sig].sd_vers != 0) { if (ps->sa_sigdesc[sig].sd_vers != __SIGTRAMP_SIGCODE_VERSION) {
olsa.linux_sa_restorer = ps->sa_sigdesc[sig].sd_tramp; olsa.linux_sa_restorer = ps->sa_sigdesc[sig].sd_tramp;
olsa.linux_sa_flags |= LINUX_SA_RESTORER; olsa.linux_sa_flags |= LINUX_SA_RESTORER;
} }