From ca13ff221b1389b04b5c8b2cbfef6a09601c2712 Mon Sep 17 00:00:00 2001 From: nwhitehorn Date: Sat, 31 Dec 2011 15:08:33 +0000 Subject: [PATCH] MFC r228646: Additional icache paranoia: non-PLT relocations can modify the text segment. It is then important to make sure the icache is synchronized again to prevent (rare) random seg faults and illegal instructions. git-svn-id: svn://svn.freebsd.org/base/stable/9@229113 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- libexec/rtld-elf/powerpc/reloc.c | 4 ++++ libexec/rtld-elf/powerpc64/reloc.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c index 4aca86edb..9df0a1c49 100644 --- a/libexec/rtld-elf/powerpc/reloc.c +++ b/libexec/rtld-elf/powerpc/reloc.c @@ -317,6 +317,10 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, RtldLockState *lockstate) done: if (cache != NULL) free(cache); + + /* Synchronize icache for text seg in case we made any changes */ + __syncicache(obj->mapbase, obj->textsize); + return (r); } diff --git a/libexec/rtld-elf/powerpc64/reloc.c b/libexec/rtld-elf/powerpc64/reloc.c index df14af2c4..d9e00e6a6 100644 --- a/libexec/rtld-elf/powerpc64/reloc.c +++ b/libexec/rtld-elf/powerpc64/reloc.c @@ -313,9 +313,12 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, RtldLockState *lockstate) } r = 0; done: - if (cache) { + if (cache) munmap(cache, bytes); - } + + /* Synchronize icache for text seg in case we made any changes */ + __syncicache(obj->mapbase, obj->textsize); + return (r); } -- 2.45.0