linux-user: Fix AT_PHDR when program headers are relocated into their own segment
PATCH 1/1 linux-user: Fix AT_PHDR when program headers are relocated into their own segment
When a binary is patched or relocated such that the program header table is moved into a separate PT_LOAD segment (rather than sitting at the start of the first loadable segment), QEMU's AT_PHDR auxv entry becomes incorrect. The loader was computing AT_PHDR as load_addr + e_phoff, which assumes the headers are mapped 1:1 from file offset 0. This breaks when the headers are elsewhere.
The Linux kernel instead locates the PT_LOAD segment that contains e_phoff, then computes the in-memory address as p_vaddr + (e_phoff - p_offset). This correctly handles relocated headers.
Fix by:
1. Add phdr_addr field to image_info to cache the resolved address.
2. Initialize to load_addr + e_phoff (fallback for headers outside any PT_LOAD).
3. In the PT_LOAD mapping loop, detect if the segment contains e_phoff and override with the segment-relative address.
4. Use info->phdr_addr for AT_PHDR instead of the incorrect formula.
--- linux-user/elfload.c | 21 ++++++++++++++++++++- linux-user/qemu.h | 1 + 2 files changed, 21 insertions(+), 1 deletion(-)
linux-user/elfload.c +20 -1
@@ -699,7 +699,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc,/* There must be exactly DLINFO_ITEMS entries here, or the assert * on info->auxv_len will trigger. */ -NEW_AUX_ENT (AT_PHDR , (abi_ulong)(info->load_addr + exec->e_phoff)); +NEW_AUX_ENT (AT_PHDR , (abi_ulong)(info->phdr_addr));NEW_AUX_ENT (AT_PHENT , (abi_ulong)(sizeof (struct elf_phdr )));NEW_AUX_ENT (AT_PHNUM , (abi_ulong)(exec->e_phnum));NEW_AUX_ENT (AT_PAGESZ , (abi_ulong)(TARGET_PAGE_SIZE ));
@@ -1469,6 +1469,12 @@ static void load_elf_image(const char *image_name, const ImageSource *src, info->data_offset = load_bias; info->load_addr = load_addr; info->entry = ehdr->e_entry + load_bias; +/* +* Fallback for AT_PHDR if the program headers do not fall within +* any PT_LOAD segment (see the loop below, which overrides this with +* the correct in-memory address when a containing segment is found). +*/ + info->phdr_addr = load_addr + ehdr->e_phoff; info->start_code =-1 ; info->end_code =0 ; info->start_data =-1 ;
@@ -1523,6 +1529,19 @@ static void load_elf_image(const char *image_name, const ImageSource *src, vaddr_ef = vaddr + eppnt->p_filesz; vaddr_em = vaddr + eppnt->p_memsz; +/* +* If this segment contains the program headers, record their +* in-memory address for AT_PHDR. This matches the kernel, which +* locates the headers via the containing PT_LOAD rather than +* assuming load_addr + e_phoff (false when the phdrs are not +* mapped 1:1 from file offset 0, e.g. relocated into their own +* segment by a binary patcher). +*/ +if (eppnt->p_offset <= ehdr->e_phoff && + ehdr->e_phoff < eppnt->p_offset + eppnt->p_filesz) { + info->phdr_addr = vaddr + (ehdr->e_phoff - eppnt->p_offset); + } +/* * Some segments may be completely empty, with a non-zero p_memsz * but no backing file segment.
linux-user/qemu.h +1 -0
@@ -26,6 +26,7 @@struct image_info {abi_ulong load_bias;abi_ulong load_addr; +abi_ulong phdr_addr;abi_ulong start_code;abi_ulong end_code;abi_ulong start_data;
Signature · 1 line
2.54.0
Quoted 2 lines · On 6/13/26 17:21, valium007 wrote:
When a binary is patched or relocated such that the program header table is moved into a separate
PT_LOADsegment
How relevant is this? How/why does it happen?
Quoted 8 lines
(rather than sitting at the start of the
first loadable segment), QEMU'sAT_PHDRauxv entry becomes incorrect. The loader was computingAT_PHDRasload_addr+e_phoff, which assumes the headers are mapped 1:1 from file offset 0. This breaks when the headers are elsewhere.The Linux kernel instead locates the
PT_LOADsegment that containse_phoff, then computes the in-memory address asp_vaddr+ (e_phoff-p_offset). This correctly handles relocated headers.
Ok, I need to check on this.
Quoted 8 lines
Fix by:
1. Addphdr_addrfield toimage_infoto cache the resolved address.
2. Initialize toload_addr+e_phoff(fallback for headers outside anyPT_LOAD).
3. In thePT_LOADmapping loop, detect if the segment containse_phoffand override with the segment-relative address.
4. Useinfo->phdr_addrforAT_PHDRinstead of the incorrect formula.Signed-off-by valium007 <[email protected]>
Can you sign with a real name?
Helge
Quoted 63 lines
--- linux-user/elfload.c | 21 ++++++++++++++++++++- linux-user/qemu.h | 1 + 2 files changed, 21 insertions(+), 1 deletion(-)linux-user/elfload.c +20
-1@@ -699,7 +699,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc,/* There must be exactly DLINFO_ITEMS entries here, or the assert * on info->auxv_len will trigger. */ -NEW_AUX_ENT (AT_PHDR , (abi_ulong)(info->load_addr + exec->e_phoff)); +NEW_AUX_ENT (AT_PHDR , (abi_ulong)(info->phdr_addr));NEW_AUX_ENT (AT_PHENT , (abi_ulong)(sizeof (struct elf_phdr )));NEW_AUX_ENT (AT_PHNUM , (abi_ulong)(exec->e_phnum));NEW_AUX_ENT (AT_PAGESZ , (abi_ulong)(TARGET_PAGE_SIZE ));@@ -1469,6 +1469,12 @@ static void load_elf_image(const char *image_name, const ImageSource *src, info->data_offset = load_bias; info->load_addr = load_addr; info->entry = ehdr->e_entry + load_bias; +/* +* Fallback for AT_PHDR if the program headers do not fall within +* any PT_LOAD segment (see the loop below, which overrides this with +* the correct in-memory address when a containing segment is found). +*/ + info->phdr_addr = load_addr + ehdr->e_phoff; info->start_code =-1 ; info->end_code =0 ; info->start_data =-1 ;@@ -1523,6 +1529,19 @@ static void load_elf_image(const char *image_name, const ImageSource *src, vaddr_ef = vaddr + eppnt->p_filesz; vaddr_em = vaddr + eppnt->p_memsz; +/* +* If this segment contains the program headers, record their +* in-memory address for AT_PHDR. This matches the kernel, which +* locates the headers via the containing PT_LOAD rather than +* assuming load_addr + e_phoff (false when the phdrs are not +* mapped 1:1 from file offset 0, e.g. relocated into their own +* segment by a binary patcher). +*/ +if (eppnt->p_offset <= ehdr->e_phoff && + ehdr->e_phoff < eppnt->p_offset + eppnt->p_filesz) { + info->phdr_addr = vaddr + (ehdr->e_phoff - eppnt->p_offset); + } +/* * Some segments may be completely empty, with a non-zero p_memsz * but no backing file segment. linux-user/qemu.h +1
-0@@ -26,6 +26,7 @@struct image_info {abi_ulong load_bias;abi_ulong load_addr; +abi_ulong phdr_addr;abi_ulong start_code;abi_ulong end_code;abi_ulong start_data;
Quoted 7 lines · Helge Deller
Quoted 3 lines · On 6/13/26 17:21, valium007 wrote:
When a binary is patched or relocated such that the program header table is
moved into a separatePT_LOADsegmentHow relevant is this? How/why does it happen?
Maybe a tcg test could be provided to show how it can be reproduced, and check this patch fixes the problem.
Quoted 105 lines
Quoted 7 lines
(rather than sitting at the start of the
first loadable segment), QEMU'sAT_PHDRauxv entry becomes incorrect. The loader was computingAT_PHDRasload_addr+e_phoff, which assumes the headers
are mapped 1:1 from file offset 0. This breaks when the headers are elsewhere.Quoted 5 lines
The Linux kernel instead locates the
PT_LOADsegment that containse_phoff,
then computes the in-memory address asp_vaddr+ (e_phoff-p_offset). This
correctly handles relocated headers.Ok, I need to check on this.
Quoted 10 lines
Fix by:
1. Addphdr_addrfield toimage_infoto cache the resolved address.
2. Initialize toload_addr+e_phoff(fallback for headers outside anyPT_LOAD).
3. In thePT_LOADmapping loop, detect if the segment containse_phoffand
override with the segment-relative address.
4. Useinfo->phdr_addrforAT_PHDRinstead of the incorrect formula.Signed-off-by valium007 <[email protected]>Can you sign with a real name?
Helge
Quoted 74 lines
---
linux-user/elfload.c| 21 ++++++++++++++++++++-
linux-user/qemu.h | 1 +2 files changed, 21 insertions(+), 1 deletion(-)linux-user/elfload.c +1
-1@@ -699,7 +699,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, /* There must be exactly DLINFO_ITEMS entries here, or the assert * on info->auxv_len will trigger. */ - NEW_AUX_ENT(AT_PHDR, (abi_ulong)(info->load_addr + exec->e_phoff)); + NEW_AUX_ENT(AT_PHDR, (abi_ulong)(info->phdr_addr)); NEW_AUX_ENT(AT_PHENT, (abi_ulong)(sizeof (struct elf_phdr))); NEW_AUX_ENT(AT_PHNUM, (abi_ulong)(exec->e_phnum));
NEW_AUX_ENT(AT_PAGESZ, (abi_ulong)(TARGET_PAGE_SIZE));linux-user/elfload.c +3
-0@@ -1469,6 +1469,12 @@ static void load_elf_image(const char *image_name, const ImageSource *src, info->data_offset = load_bias; info->load_addr = load_addr; info->entry = ehdr->e_entry + load_bias; + /* +* Fallback for AT_PHDR if the program headers do not fall within +* any PT_LOAD segment (see the loop below, which overrides this with
+ * the correct in-memory address when a containing segment is found).
+ */
+info->phdr_addr=load_addr+ehdr->e_phoff;info->start_code= -1;
info->end_code= 0;
info->start_data= -1;linux-user/elfload.c +0
-0@@ -1523,6 +1529,19 @@ static void load_elf_image(const char *image_name, const ImageSource *src, vaddr_ef = vaddr + eppnt->p_filesz; vaddr_em = vaddr + eppnt->p_memsz;+ /*
+ * If this segment contains the program headers, record their
+ * in-memory address forAT_PHDR. This matches the kernel, which
+ * locates the headers via the containingPT_LOADrather than
+ * assumingload_addr+e_phoff(false when the phdrs are not
+ * mapped 1:1 from file offset 0, e.g. relocated into their own
+ * segment by a binary patcher).
+ */
+ if (eppnt->p_offset<=ehdr->e_phoff&&
+ehdr->e_phoff<eppnt->p_offset+eppnt->p_filesz) { +info->phdr_addr= vaddr + (ehdr->e_phoff- eppnt-Quoted 1 line
p_offset);+ }
+
/*
* Some segments may be completely empty, with a non- zerop_memsz
* but no backing file segment.linux-user/qemu.h +1
-0@@ -26,6 +26,7 @@ struct image_info { abi_ulong load_bias; abi_ulong load_addr; + abi_ulong phdr_addr; abi_ulong start_code; abi_ulong end_code; abi_ulong start_data;
Quoted 5 lines · Helge Deller
Quoted 2 lines · On 6/13/26 17:21, valium007 wrote:
When a binary is patched or relocated such that the program header table is moved into a separate
PT_LOADsegmentHow relevant is this? How/why does it happen?
This is very much relevant with the issue. This can happen when certain packers/protectors move the phdrs into a separate PT_LOAD for the purpose of anti-tamper/protection mechanisms. The patched binary will run on real environment but not on QEMU (in most cases the binary will segfault).
Quoted 1 line
Can you sign with a real name?
Sure, this is my very first patch on qemu, to continue with this I think I need to send the patch again with my real name signed off?
Quoted 63 lines
Quoted 63 lines
--- linux-user/elfload.c | 21 ++++++++++++++++++++- linux-user/qemu.h | 1 + 2 files changed, 21 insertions(+), 1 deletion(-)linux-user/elfload.c +20
-1@@ -699,7 +699,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc,/* There must be exactly DLINFO_ITEMS entries here, or the assert * on info->auxv_len will trigger. */ -NEW_AUX_ENT (AT_PHDR , (abi_ulong)(info->load_addr + exec->e_phoff)); +NEW_AUX_ENT (AT_PHDR , (abi_ulong)(info->phdr_addr));NEW_AUX_ENT (AT_PHENT , (abi_ulong)(sizeof (struct elf_phdr )));NEW_AUX_ENT (AT_PHNUM , (abi_ulong)(exec->e_phnum));NEW_AUX_ENT (AT_PAGESZ , (abi_ulong)(TARGET_PAGE_SIZE ));@@ -1469,6 +1469,12 @@ static void load_elf_image(const char *image_name, const ImageSource *src, info->data_offset = load_bias; info->load_addr = load_addr; info->entry = ehdr->e_entry + load_bias; +/* +* Fallback for AT_PHDR if the program headers do not fall within +* any PT_LOAD segment (see the loop below, which overrides this with +* the correct in-memory address when a containing segment is found). +*/ + info->phdr_addr = load_addr + ehdr->e_phoff; info->start_code =-1 ; info->end_code =0 ; info->start_data =-1 ;@@ -1523,6 +1529,19 @@ static void load_elf_image(const char *image_name, const ImageSource *src, vaddr_ef = vaddr + eppnt->p_filesz; vaddr_em = vaddr + eppnt->p_memsz; +/* +* If this segment contains the program headers, record their +* in-memory address for AT_PHDR. This matches the kernel, which +* locates the headers via the containing PT_LOAD rather than +* assuming load_addr + e_phoff (false when the phdrs are not +* mapped 1:1 from file offset 0, e.g. relocated into their own +* segment by a binary patcher). +*/ +if (eppnt->p_offset <= ehdr->e_phoff && + ehdr->e_phoff < eppnt->p_offset + eppnt->p_filesz) { + info->phdr_addr = vaddr + (ehdr->e_phoff - eppnt->p_offset); + } +/* * Some segments may be completely empty, with a non-zero p_memsz * but no backing file segment. linux-user/qemu.h +1
-0@@ -26,6 +26,7 @@struct image_info {abi_ulong load_bias;abi_ulong load_addr; +abi_ulong phdr_addr;abi_ulong start_code;abi_ulong end_code;abi_ulong start_data;
Quoted 5 lines · valium
Quoted 4 lines · Helge Deller
Quoted 2 lines · On 6/13/26 17:21, valium007 wrote:
When a binary is patched or relocated such that the program header table is moved into a separate
PT_LOADsegment
Quoted 7 lines
Quoted 1 line
How relevant is this? How/why does it happen?
This is very much relevant with the issue. This can happen when certain packers/protectors move the phdrs into a separate
PT_LOADfor the purpose of anti-tamper/protection mechanisms. The patched binary will run on real environment but not on QEMU (in most cases the binary will segfault).
Ok. (Still seems like a niche issue).
Quoted 4 lines
Quoted 1 line
Can you sign with a real name?
Sure, this is my very first patch on qemu, to continue with this I think I need to send the patch again with my real name signed off?
It's sufficient if you let us know what it should be.
Helge
Quoted 66 lines
Quoted 64 lines
Quoted 64 lines
--- linux-user/elfload.c | 21 ++++++++++++++++++++- linux-user/qemu.h | 1 + 2 files changed, 21 insertions(+), 1 deletion(-)linux-user/elfload.c +20
-1@@ -699,7 +699,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc,/* There must be exactly DLINFO_ITEMS entries here, or the assert * on info->auxv_len will trigger. */ -NEW_AUX_ENT (AT_PHDR , (abi_ulong)(info->load_addr + exec->e_phoff)); +NEW_AUX_ENT (AT_PHDR , (abi_ulong)(info->phdr_addr));NEW_AUX_ENT (AT_PHENT , (abi_ulong)(sizeof (struct elf_phdr )));NEW_AUX_ENT (AT_PHNUM , (abi_ulong)(exec->e_phnum));NEW_AUX_ENT (AT_PAGESZ , (abi_ulong)(TARGET_PAGE_SIZE ));@@ -1469,6 +1469,12 @@ static void load_elf_image(const char *image_name, const ImageSource *src, info->data_offset = load_bias; info->load_addr = load_addr; info->entry = ehdr->e_entry + load_bias; +/* +* Fallback for AT_PHDR if the program headers do not fall within +* any PT_LOAD segment (see the loop below, which overrides this with +* the correct in-memory address when a containing segment is found). +*/ + info->phdr_addr = load_addr + ehdr->e_phoff; info->start_code =-1 ; info->end_code =0 ; info->start_data =-1 ;@@ -1523,6 +1529,19 @@ static void load_elf_image(const char *image_name, const ImageSource *src, vaddr_ef = vaddr + eppnt->p_filesz; vaddr_em = vaddr + eppnt->p_memsz; +/* +* If this segment contains the program headers, record their +* in-memory address for AT_PHDR. This matches the kernel, which +* locates the headers via the containing PT_LOAD rather than +* assuming load_addr + e_phoff (false when the phdrs are not +* mapped 1:1 from file offset 0, e.g. relocated into their own +* segment by a binary patcher). +*/ +if (eppnt->p_offset <= ehdr->e_phoff && + ehdr->e_phoff < eppnt->p_offset + eppnt->p_filesz) { + info->phdr_addr = vaddr + (ehdr->e_phoff - eppnt->p_offset); + } +/* * Some segments may be completely empty, with a non-zero p_memsz * but no backing file segment. linux-user/qemu.h +1
-0@@ -26,6 +26,7 @@struct image_info {abi_ulong load_bias;abi_ulong load_addr; +abi_ulong phdr_addr;abi_ulong start_code;abi_ulong end_code;abi_ulong start_data;
Quoted 1 line · Helge Deller
It's sufficient if you let us know what it should be.
My real name is Akshit Yadav.
Quoted 66 lines
Quoted 66 lines
Quoted 64 lines
Quoted 64 lines
--- linux-user/elfload.c | 21 ++++++++++++++++++++- linux-user/qemu.h | 1 + 2 files changed, 21 insertions(+), 1 deletion(-)linux-user/elfload.c +20
-1@@ -699,7 +699,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc,/* There must be exactly DLINFO_ITEMS entries here, or the assert * on info->auxv_len will trigger. */ -NEW_AUX_ENT (AT_PHDR , (abi_ulong)(info->load_addr + exec->e_phoff)); +NEW_AUX_ENT (AT_PHDR , (abi_ulong)(info->phdr_addr));NEW_AUX_ENT (AT_PHENT , (abi_ulong)(sizeof (struct elf_phdr )));NEW_AUX_ENT (AT_PHNUM , (abi_ulong)(exec->e_phnum));NEW_AUX_ENT (AT_PAGESZ , (abi_ulong)(TARGET_PAGE_SIZE ));@@ -1469,6 +1469,12 @@ static void load_elf_image(const char *image_name, const ImageSource *src, info->data_offset = load_bias; info->load_addr = load_addr; info->entry = ehdr->e_entry + load_bias; +/* +* Fallback for AT_PHDR if the program headers do not fall within +* any PT_LOAD segment (see the loop below, which overrides this with +* the correct in-memory address when a containing segment is found). +*/ + info->phdr_addr = load_addr + ehdr->e_phoff; info->start_code =-1 ; info->end_code =0 ; info->start_data =-1 ;@@ -1523,6 +1529,19 @@ static void load_elf_image(const char *image_name, const ImageSource *src, vaddr_ef = vaddr + eppnt->p_filesz; vaddr_em = vaddr + eppnt->p_memsz; +/* +* If this segment contains the program headers, record their +* in-memory address for AT_PHDR. This matches the kernel, which +* locates the headers via the containing PT_LOAD rather than +* assuming load_addr + e_phoff (false when the phdrs are not +* mapped 1:1 from file offset 0, e.g. relocated into their own +* segment by a binary patcher). +*/ +if (eppnt->p_offset <= ehdr->e_phoff && + ehdr->e_phoff < eppnt->p_offset + eppnt->p_filesz) { + info->phdr_addr = vaddr + (ehdr->e_phoff - eppnt->p_offset); + } +/* * Some segments may be completely empty, with a non-zero p_memsz * but no backing file segment. linux-user/qemu.h +1
-0@@ -26,6 +26,7 @@struct image_info {abi_ulong load_bias;abi_ulong load_addr; +abi_ulong phdr_addr;abi_ulong start_code;abi_ulong end_code;abi_ulong start_data;