diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/capstone/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/capstone/files')
-rw-r--r-- | dev-libs/capstone/files/capstone-3.0.5_rc2-CVE-2017-6952.patch | 41 | ||||
-rw-r--r-- | dev-libs/capstone/files/capstone-3.0.5_rc2-FLAGS.patch | 16 |
2 files changed, 0 insertions, 57 deletions
diff --git a/dev-libs/capstone/files/capstone-3.0.5_rc2-CVE-2017-6952.patch b/dev-libs/capstone/files/capstone-3.0.5_rc2-CVE-2017-6952.patch deleted file mode 100644 index ba16126f7411..000000000000 --- a/dev-libs/capstone/files/capstone-3.0.5_rc2-CVE-2017-6952.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit 6fe86eef621b9849f51a5e1e5d73258a93440403 -Author: Quang Nguyễn <quangnh89@users.noreply.github.com> -Date: Mon Mar 13 22:34:48 2017 +0700 - - provide a validity check to prevent against Integer overflow conditions (#870) - - * provide a validity check to prevent against Integer overflow conditions - - * fix some style issues. - -diff --git a/windows/winkernel_mm.c b/windows/winkernel_mm.c -index c127da3a..ecdc1ca2 100644 ---- a/windows/winkernel_mm.c -+++ b/windows/winkernel_mm.c -@@ -3,6 +3,7 @@ - - #include "winkernel_mm.h" - #include <ntddk.h> -+#include <Ntintsafe.h> - - // A pool tag for memory allocation - static const ULONG CS_WINKERNEL_POOL_TAG = 'kwsC'; -@@ -33,8 +34,16 @@ void * CAPSTONE_API cs_winkernel_malloc(size_t size) - - // FP; a use of NonPagedPool is required for Windows 7 support - #pragma prefast(suppress : 30030) // Allocating executable POOL_TYPE memory -- CS_WINKERNEL_MEMBLOCK *block = (CS_WINKERNEL_MEMBLOCK *)ExAllocatePoolWithTag( -- NonPagedPool, size + sizeof(CS_WINKERNEL_MEMBLOCK), CS_WINKERNEL_POOL_TAG); -+ size_t number_of_bytes = 0; -+ CS_WINKERNEL_MEMBLOCK *block = NULL; -+ // A specially crafted size value can trigger the overflow. -+ // If the sum in a value that overflows or underflows the capacity of the type, -+ // the function returns NULL. -+ if (!NT_SUCCESS(RtlSizeTAdd(size, sizeof(CS_WINKERNEL_MEMBLOCK), &number_of_bytes))) { -+ return NULL; -+ } -+ block = (CS_WINKERNEL_MEMBLOCK *)ExAllocatePoolWithTag( -+ NonPagedPool, number_of_bytes, CS_WINKERNEL_POOL_TAG); - if (!block) { - return NULL; - } diff --git a/dev-libs/capstone/files/capstone-3.0.5_rc2-FLAGS.patch b/dev-libs/capstone/files/capstone-3.0.5_rc2-FLAGS.patch deleted file mode 100644 index 4be2ed4ba0e6..000000000000 --- a/dev-libs/capstone/files/capstone-3.0.5_rc2-FLAGS.patch +++ /dev/null @@ -1,16 +0,0 @@ -Add support for user overridden CFLAGS and LDFLAGS -diff --git a/cstool/Makefile b/cstool/Makefile -index 450ac1b..3cf2a81 100644 ---- a/cstool/Makefile -+++ b/cstool/Makefile -@@ -3,2 +3,3 @@ - include ../functions.mk -+include ../config.mk - -@@ -8,4 +9,4 @@ LIBNAME = capstone - --CFLAGS = -I../include --LDFLAGS = -O3 -Wall -L.. -l$(LIBNAME) -+CFLAGS += -I../include -+LDFLAGS += -Wall -L.. -l$(LIBNAME) - |