[xen staging-4.20] x86/mkelf32: account for offset when detecting note segment placement

[patchbot@xxxxxxx]

commit 8c788b41d7a8fa378f4d8b639955f01bb571809f
Author:     Roger Pau Monné <roger.pau@xxxxxxxxxx>
AuthorDate: Thu Mar 27 14:55:29 2025 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Mar 27 14:55:29 2025 +0100

    x86/mkelf32: account for offset when detecting note segment placement
    
    mkelf32 attempt to check that the program header defined NOTE segment falls
    inside of the LOAD segment, as the build-id should be loaded for Xen at
    runtime to check.
    
    However the current code doesn't take into account the LOAD program header
    segment offset when calculating overlap with the NOTE segment.  This
    results in incorrect detection, and the following build error:
    
    arch/x86/boot/mkelf32 --notes xen-syms ./.xen.elf32 0x200000 \
                   `nm xen-syms | sed -ne 's/^\([^ ]*\) . 
__2M_rwdata_end$/0x\1/p'`
    Expected .note section within .text section!
    Offset 4244776 not within 2910364!
    
    When xen-syms has the following program headers:
    
    Program Header:
        LOAD off    0x0000000000200000 vaddr 0xffff82d040200000 paddr 
0x0000000000200000 align 2**21
             filesz 0x00000000002c689c memsz 0x00000000003f7e20 flags rwx
        NOTE off    0x000000000040c528 vaddr 0xffff82d04040c528 paddr 
0x000000000040c528 align 2**2
             filesz 0x0000000000000024 memsz 0x0000000000000024 flags r--
    
    Account for the program header offset of the LOAD segment when checking
    whether the NOTE segments is contained within.  Also fix the logic to
    ensure the NOTE segments is fully contained between the LOAD segment.
    
    Fixes: a353cab905af ('build_id: Provide ld-embedded build-ids')
    Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
    master commit: 6e5fed7cb67c9f84653cdbd3924b8a119ef653be
    master date: 2025-03-20 12:28:30 +0100
---
 xen/arch/x86/boot/mkelf32.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/xen/arch/x86/boot/mkelf32.c b/xen/arch/x86/boot/mkelf32.c
index 5f9e7e440e..f0f406687c 100644
--- a/xen/arch/x86/boot/mkelf32.c
+++ b/xen/arch/x86/boot/mkelf32.c
@@ -358,11 +358,13 @@ int main(int argc, char **argv)
         note_sz = in64_phdr.p_memsz;
         note_base = in64_phdr.p_vaddr - note_base;
 
-        if ( in64_phdr.p_offset > dat_siz || offset > in64_phdr.p_offset )
+        if ( in64_phdr.p_offset < offset ||
+             in64_phdr.p_offset + in64_phdr.p_filesz > offset + dat_siz )
         {
             fprintf(stderr, "Expected .note section within .text section!\n" \
-                    "Offset %"PRId64" not within %d!\n",
-                    in64_phdr.p_offset, dat_siz);
+                    ".note: [%"PRIx64", %"PRIx64") .text: [%x, %x)\n",
+                    in64_phdr.p_offset, in64_phdr.p_offset + 
in64_phdr.p_filesz,
+                    offset, offset + dat_siz);
             return 1;
         }
         /* Gets us the absolute offset within the .text section. */
--
generated by git-patchbot for /home/xen/git/xen.git#staging-4.20