mkimage: fix segfault on MacOS arm64
PATCH v2 1/1 mkimage: fix segfault on MacOS arm64
mkimage segfaults due ASLR mechasim on MacOS arm64
It is required to use _dyld_get_image_vmaddr_slide() to prevent segfault on MacOS arm64
This patch ased on the discussion
https://github.com/u-boot/u-boot/commit/3b142045e8a7f0ab17b6099e9226296af45967d0
Thanks to Ronny Kotzschmar and ptpt52 github user
--- tools/imagetool.h | 2 ++ 1 file changed, 2 insertions(+)
tools/imagetool.h +2 -0
@@ -271,11 +271,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); \
Signature · 1 line
2.32.0 (Apple Git-132)
Quoted 38 lines · Sergey V. Lobanov
mkimage segfaults due ASLR mechasim on MacOS arm64
It is required to use
_dyld_get_image_vmaddr_slide()to prevent segfault on MacOS arm64This patch ased on the discussion
https://github.com/u-boot/u-boot/commit/3b142045e8a7f0ab17b6099e9226296af45967d0Thanks to Ronny Kotzschmar and ptpt52 github user
Signed-off-by Sergey V. Lobanov <[email protected]>---
tools/imagetool.h| 2 ++1 file changed, 2 insertions(+)tools/imagetool.h +2
-0@@ -271,11 +271,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); \Signature · 1 line
2.32.0 (Apple Git-132)
Quoted 23 lines · Sergey V. Lobanov
mkimage segfaults due ASLR mechasim on MacOS arm64
It is required to use
_dyld_get_image_vmaddr_slide()to prevent segfault on MacOS arm64This patch ased on the discussion
https://github.com/u-boot/u-boot/commit/3b142045e8a7f0ab17b6099e9226296af45967d0Thanks to Ronny Kotzschmar and ptpt52 github user
Signed-off-by Sergey V. Lobanov <[email protected]>--- tools/imagetool.h | 2 ++ 1 file changed, 2 insertions(+)tools/imagetool.h +0
-0@@ -271,11 +271,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>
tools/imagetool.h int rockchip_copy_image(int fd, struct image_tool_params *mparams); · line 283
Quoted 10 lines
tools/imagetool.h +2
-0+#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); \
This now seems sensible to me, thanks for fixing my mess.
(though you may want to clean up your commit message; "ased" is missing the leading b and you're still missing the verb "is", plus "mechasim" should be "mechanism" and it should be "due to the", not just "due")
Jess
Thank you, Jessica.
I have rebased on current master, added Reviewed-by tag, fixed grammar/typos and sent v3
Quoted 46 lines · Jessica Clarke
Quoted 23 lines · Sergey V. Lobanov
mkimage segfaults due ASLR mechasim on MacOS arm64
It is required to use
_dyld_get_image_vmaddr_slide()to prevent segfault on MacOS arm64This patch ased on the discussion
https://github.com/u-boot/u-boot/commit/3b142045e8a7f0ab17b6099e9226296af45967d0Thanks to Ronny Kotzschmar and ptpt52 github user
Signed-off-by Sergey V. Lobanov <[email protected]>---
tools/imagetool.h| 2 ++1 file changed, 2 insertions(+)tools/imagetool.h +0
-0@@ -271,11 +271,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> tools/imagetool.h int rockchip_copy_image(int fd, struct image_tool_params *mparams); · line 283
Quoted 10 lines
tools/imagetool.h +2
-0+#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); \This now seems sensible to me, thanks for fixing my mess.
Reviewed-by Jessica Clarke <[email protected]>(though you may want to clean up your commit message; "ased" is missing the leading b and you're still missing the verb "is", plus "mechasim" should be "mechanism" and it should be "due to the", not just "due")
Jess