From 1537775f6631f73b894ffafed06bcfc64cf5c704 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sat, 17 Feb 2018 18:39:39 -0600 Subject: [PATCH] ntdll-x86_64_ExceptionInformation: Remove patch 0002. Fixed by https://source.winehq.org/git/wine.git/commit/959d240cbe5f13612ee7fb6fc0aaaef87c436118 --- ...h-when-trying-to-access-page-prot-of.patch | 25 ------------------- patches/patchinstall.sh | 4 +-- 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 patches/ntdll-x86_64_ExceptionInformation/0002-ntdll-Avoid-crash-when-trying-to-access-page-prot-of.patch diff --git a/patches/ntdll-x86_64_ExceptionInformation/0002-ntdll-Avoid-crash-when-trying-to-access-page-prot-of.patch b/patches/ntdll-x86_64_ExceptionInformation/0002-ntdll-Avoid-crash-when-trying-to-access-page-prot-of.patch deleted file mode 100644 index 6cdd46e2..00000000 --- a/patches/ntdll-x86_64_ExceptionInformation/0002-ntdll-Avoid-crash-when-trying-to-access-page-prot-of.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 70bb327be039fc1d2b39df43af59e3d138724eff Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Wed, 4 Oct 2017 01:47:29 +0200 -Subject: ntdll: Avoid crash when trying to access page prot of address beyond - address space limit. - ---- - dlls/ntdll/virtual.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c -index a496401e028..368e0ad0f9e 100644 ---- a/dlls/ntdll/virtual.c -+++ b/dlls/ntdll/virtual.c -@@ -196,6 +196,7 @@ static BYTE get_page_vprot( const void *addr ) - size_t idx = (size_t)addr >> page_shift; - - #ifdef _WIN64 -+ if ((idx >> pages_vprot_shift) >= pages_vprot_size) return 0; - if (!pages_vprot[idx >> pages_vprot_shift]) return 0; - return pages_vprot[idx >> pages_vprot_shift][idx & pages_vprot_mask]; - #else --- -2.14.1 - diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index fcf38ab9..a853b1ad 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -5884,17 +5884,15 @@ fi # Patchset ntdll-x86_64_ExceptionInformation # | # | Modified files: -# | * dlls/ntdll/signal_x86_64.c, dlls/ntdll/virtual.c +# | * dlls/ntdll/signal_x86_64.c # | if test "$enable_ntdll_x86_64_ExceptionInformation" -eq 1; then patch_apply ntdll-x86_64_ExceptionInformation/0001-ntdll-Set-proper-ExceptionInformation-0-for-x86_64-e.patch - patch_apply ntdll-x86_64_ExceptionInformation/0002-ntdll-Avoid-crash-when-trying-to-access-page-prot-of.patch patch_apply ntdll-x86_64_ExceptionInformation/0003-ntdll-Translate-icebp-instruction-to-EXCEPTION_SINGL.patch patch_apply ntdll-x86_64_ExceptionInformation/0004-ntdll-Correctly-handle-privileged-instructions-on-x8.patch patch_apply ntdll-x86_64_ExceptionInformation/0005-ntdll-Handle-interrupt-0x2c-on-x86_64.patch ( printf '%s\n' '+ { "Sebastian Lackner", "ntdll: Set proper ExceptionInformation[0] for x86_64 exceptions.", 1 },'; - printf '%s\n' '+ { "Sebastian Lackner", "ntdll: Avoid crash when trying to access page prot of address beyond address space limit.", 1 },'; printf '%s\n' '+ { "Michael Müller", "ntdll: Translate icebp instruction to EXCEPTION_SINGLE_STEP on x64.", 1 },'; printf '%s\n' '+ { "Sebastian Lackner", "ntdll: Correctly handle privileged instructions on x86_64.", 1 },'; printf '%s\n' '+ { "Andrew Wesie", "ntdll: Handle interrupt 0x2c on x86_64.", 1 },';