Fix mmap infinite recurse in memory patcher
This commit fixes issue #6853 by removing MacOS/Darwin-specific logic from intercept_mmap. Signed-off-by: Harumi Kuno <harumi.kuno@hpe.com>
Этот коммит содержится в:
родитель
2d515f747f
Коммит
fbbacc1303
@ -40,10 +40,6 @@ AC_DEFUN([MCA_opal_memory_patcher_CONFIG],[
|
|||||||
|
|
||||||
AC_CHECK_HEADERS([linux/mman.h sys/syscall.h])
|
AC_CHECK_HEADERS([linux/mman.h sys/syscall.h])
|
||||||
|
|
||||||
AC_CHECK_DECLS([__mmap], [], [], [#include <sys/mman.h>])
|
|
||||||
|
|
||||||
AC_CHECK_FUNCS([__mmap])
|
|
||||||
|
|
||||||
AC_CHECK_DECLS([__syscall], [], [], [#include <sys/syscall.h>])
|
AC_CHECK_DECLS([__syscall], [], [], [#include <sys/syscall.h>])
|
||||||
|
|
||||||
AC_CHECK_FUNCS([__syscall])
|
AC_CHECK_FUNCS([__syscall])
|
||||||
|
@ -125,12 +125,7 @@ static void *_intercept_mmap(void *start, size_t length, int prot, int flags, in
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!original_mmap) {
|
if (!original_mmap) {
|
||||||
#ifdef HAVE___MMAP
|
|
||||||
/* the darwin syscall returns an int not a long so call the underlying __mmap function */
|
|
||||||
result = __mmap (start, length, prot, flags, fd, offset);
|
|
||||||
#else
|
|
||||||
result = (void*)(intptr_t) memory_patcher_syscall(SYS_mmap, start, length, prot, flags, fd, offset);
|
result = (void*)(intptr_t) memory_patcher_syscall(SYS_mmap, start, length, prot, flags, fd, offset);
|
||||||
#endif
|
|
||||||
} else {
|
} else {
|
||||||
result = original_mmap (start, length, prot, flags, fd, offset);
|
result = original_mmap (start, length, prot, flags, fd, offset);
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user