From 39d7dcb2c6c31585b1e2245563638b1b06e98bf0 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 13 Sep 2019 17:03:00 -0500 Subject: [PATCH] Rebase against 3bf7473b880eea8b8dcaa43487afda2d7b1fbd03. --- ...k-protector-frame-in-signal-handler-.patch | 24 +++++++++---------- patches/patchinstall.sh | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/patches/ntdll-Signal_Handler/0001-ntdll-Avoid-stack-protector-frame-in-signal-handler-.patch b/patches/ntdll-Signal_Handler/0001-ntdll-Avoid-stack-protector-frame-in-signal-handler-.patch index 3eb6f136..a83ff948 100644 --- a/patches/ntdll-Signal_Handler/0001-ntdll-Avoid-stack-protector-frame-in-signal-handler-.patch +++ b/patches/ntdll-Signal_Handler/0001-ntdll-Avoid-stack-protector-frame-in-signal-handler-.patch @@ -1,4 +1,4 @@ -From 39d6c2f1add7583ea3305777a6e869d4f1e7b5de Mon Sep 17 00:00:00 2001 +From 340e2dae3a619b3f1d58aabc2f0e4af4e8e07e56 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 20 Aug 2017 17:22:20 +0200 Subject: [PATCH] ntdll: Avoid stack protector frame in signal handler @@ -9,7 +9,7 @@ Subject: [PATCH] ntdll: Avoid stack protector frame in signal handler 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c -index 7ddc64284e..372fd1e91b 100644 +index 1645c9c7d..a86fcf256 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -96,6 +96,13 @@ typedef struct @@ -44,7 +44,7 @@ index 7ddc64284e..372fd1e91b 100644 { TEB *teb = get_current_teb(); -@@ -1840,7 +1847,7 @@ static struct stack_layout *setup_exception_record( ucontext_t *sigcontext, void +@@ -1842,7 +1849,7 @@ static struct stack_layout *setup_exception_record( ucontext_t *sigcontext, void * sigcontext so that the return from the signal handler will call * the raise function. */ @@ -53,7 +53,7 @@ index 7ddc64284e..372fd1e91b 100644 { WORD fs, gs; void *stack = init_handler( sigcontext, &fs, &gs ); -@@ -1964,7 +1971,7 @@ static BOOL handle_interrupt( unsigned int interrupt, ucontext_t *sigcontext, st +@@ -1982,7 +1989,7 @@ static void segv_handler_early( int signal, siginfo_t *siginfo, void *sigcontext * * Handler for SIGSEGV and related errors. */ @@ -62,7 +62,7 @@ index 7ddc64284e..372fd1e91b 100644 { WORD fs, gs; struct stack_layout *stack; -@@ -2083,7 +2090,7 @@ done: +@@ -2101,7 +2108,7 @@ done: * * Handler for SIGTRAP. */ @@ -71,7 +71,7 @@ index 7ddc64284e..372fd1e91b 100644 { ucontext_t *context = sigcontext; struct stack_layout *stack = setup_exception( context ); -@@ -2125,7 +2132,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +@@ -2143,7 +2150,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) * * Handler for SIGFPE. */ @@ -80,7 +80,7 @@ index 7ddc64284e..372fd1e91b 100644 { ucontext_t *context = sigcontext; struct stack_layout *stack = setup_exception( context ); -@@ -2173,7 +2180,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +@@ -2191,7 +2198,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) * * FIXME: should not be calling external functions on the signal stack. */ @@ -88,8 +88,8 @@ index 7ddc64284e..372fd1e91b 100644 +static void SIGNALFUNC int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { WORD fs, gs; - init_handler( sigcontext, &fs, &gs ); -@@ -2190,7 +2197,7 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) + void *stack_ptr = init_handler( sigcontext, &fs, &gs ); +@@ -2208,7 +2215,7 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) * * Handler for SIGABRT. */ @@ -98,7 +98,7 @@ index 7ddc64284e..372fd1e91b 100644 { struct stack_layout *stack = setup_exception( sigcontext ); stack->rec.ExceptionCode = EXCEPTION_WINE_ASSERTION; -@@ -2204,7 +2211,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +@@ -2222,7 +2229,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) * * Handler for SIGQUIT. */ @@ -107,7 +107,7 @@ index 7ddc64284e..372fd1e91b 100644 { WORD fs, gs; init_handler( sigcontext, &fs, &gs ); -@@ -2217,7 +2224,7 @@ static void quit_handler( int signal, siginfo_t *siginfo, void *sigcontext ) +@@ -2235,7 +2242,7 @@ static void quit_handler( int signal, siginfo_t *siginfo, void *sigcontext ) * * Handler for SIGUSR1, used to signal a thread that it got suspended. */ @@ -117,5 +117,5 @@ index 7ddc64284e..372fd1e91b 100644 CONTEXT context; WORD fs, gs; -- -2.17.1 +2.23.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index c6dd759f..b3756a94 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "85d8d1390467147fca416236fd50bb6ea2e2c8e4" + echo "3bf7473b880eea8b8dcaa43487afda2d7b1fbd03" } # Show version information