mkimage: fix segfault on MacOS arm64
authorSergey V. Lobanov <sergey@lobanov.in>
Mon, 24 Jan 2022 23:29:44 +0000 (02:29 +0300)
committerTom Rini <trini@konsulko.com>
Mon, 31 Jan 2022 15:17:16 +0000 (10:17 -0500)
mkimage segfaults due to the ASLR mechanism on MacOS arm64

It is required to use _dyld_get_image_vmaddr_slide()
to prevent segfault on MacOS arm64

This patch is based on the discussion
https://github.com/u-boot/u-boot/commit/3b142045e8a7f0ab17b6099e9226296af45967d0

Thanks to Jessica Clarke, Ronny Kotzschmar and ptpt52 github user

Reviewed-by: Jessica Clarke <jrtc27@jrtc27.com>
Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in>
tools/imagetool.h

index 413e97c..a410551 100644 (file)
@@ -275,11 +275,13 @@ int rockchip_copy_image(int fd, struct image_tool_params *mparams);
  *  b) we need a API call to get the respective section symbols */
 #if defined(__MACH__)
 #include <mach-o/getsect.h>
+#include <mach-o/dyld.h>
 
 #define INIT_SECTION(name)  do {                                       \
                unsigned long name ## _len;                             \
                char *__cat(pstart_, name) = getsectdata("__DATA",      \
                        #name, &__cat(name, _len));                     \
+               __cat(pstart_, name) += _dyld_get_image_vmaddr_slide(0);\
                char *__cat(pstop_, name) = __cat(pstart_, name) +      \
                        __cat(name, _len);                              \
                __cat(__start_, name) = (void *)__cat(pstart_, name);   \