From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by sourceware.org (Postfix) with ESMTPS id 28916385141C for ; Wed, 26 Jan 2022 16:12:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 28916385141C Received: by mail-pj1-x102f.google.com with SMTP id q63so158019pja.1 for ; Wed, 26 Jan 2022 08:12:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DsQSskWQ4ge48ymdOoLdCXRYQIQcVwA1u8i0VfTl+b0=; b=VC1dhlifpE/MNB3e4dcEnKp6X7qifeJuB+J5DLf9mJnuG6vfxXseOVRe4rJE9NCBun farDMI0hycAN5mhv5Or8p9ISSBD+i3WUiOEZ65DSO9IaoQdnS8Bvf/539SxzMiVg8i6D 0rJs4xjn0yKWIbDaYvWeUnPBG6yJBQdHpYMI02JCw5fNS8FBWdjhRc1BKR0awN6Vd8sD 0aAGbc5R6UAxddxysylLQQmSSkUfFtYx/rA905t7oo9qMUR22cyJkS51jResj3Ni3zV+ prI46nVOLCBzVsayg1M2/R/5f620whBJO8diPzjYqp5mG6DnURVWGGO7n16t4nVMNcd3 sq9g== X-Gm-Message-State: AOAM532OUmPpLKWS3+3iSpuA8WTHwQpMTwV/phCABzWPJqeLzur6bQo4 bW0irRO/IDOIWN0j9AhVGGGoKNemC5pIEpTF5JE= X-Google-Smtp-Source: ABdhPJzKxbv46yb0urs09dmL0lDroE9rVoq69FnCjgHwmTovGJre9FnyodA0517Zr/JJVWeeZ38lJ80ItC/XBQrUvU0= X-Received: by 2002:a17:90b:1b46:: with SMTP id nv6mr9264255pjb.143.1643213524246; Wed, 26 Jan 2022 08:12:04 -0800 (PST) MIME-Version: 1.0 References: <20220125170523.952874-1-adhemerval.zanella@linaro.org> <877damvmen.fsf@oldenburg.str.redhat.com> <4ff7e613-2f51-cd9f-1466-68388f6a2a3a@linaro.org> <93520ad8-93d7-a29b-d145-467f3a913525@linaro.org> <38575072-69d4-872c-1397-84b65f840604@linaro.org> In-Reply-To: <38575072-69d4-872c-1397-84b65f840604@linaro.org> From: "H.J. Lu" Date: Wed, 26 Jan 2022 08:11:28 -0800 Message-ID: Subject: Re: [PATCH] elf: Replace tst-p_alignmod1-editX with a python script To: Adhemerval Zanella Cc: Florian Weimer , Adhemerval Zanella via Libc-alpha , "Carlos O'Donell" , Joseph Myers Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3027.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jan 2022 16:12:06 -0000 On Wed, Jan 26, 2022 at 7:54 AM Adhemerval Zanella wrote: > > > > On 26/01/2022 12:46, H.J. Lu wrote: > > On Wed, Jan 26, 2022 at 7:45 AM Adhemerval Zanella > > wrote: > >> > >> > >> > >> On 26/01/2022 12:35, H.J. Lu wrote: > >>> On Wed, Jan 26, 2022 at 4:10 AM Adhemerval Zanella > >>> wrote: > >>>> > >>>> > >>>> > >>>> On 26/01/2022 07:09, Florian Weimer wrote: > >>>>> * Adhemerval Zanella via Libc-alpha: > >>>>> > >>>>>> diff --git a/scripts/tst-elf-edit.py b/scripts/tst-elf-edit.py > >>>>>> new file mode 100644 > >>>>>> index 0000000000..1fb9b8e0fe > >>>>>> --- /dev/null > >>>>>> +++ b/scripts/tst-elf-edit.py > >>>>>> @@ -0,0 +1,206 @@ > >>>>> > >>>>>> +class Elf_Ehdr: > >>>>>> + def __init__(self, e_ident): > >>>>>> + endian, addr, off = elf_types_fmts(e_ident) > >>>>>> + self.fmt = '{0}HHI{1}{2}{2}IHHHHHH'.format(endian, addr, off) > >>>>>> + self.len = struct.calcsize(self.fmt) > >>>>>> + > >>>>>> + def read(self, f): > >>>>>> + buf = f.read(self.len) > >>>>>> + if not buf: > >>>>>> + error('{}: header too small'.format(f.name)) > >>>>> > >>>>> I think you need to check len(buf) < self.len. > >>>> > >>>> Ack. > >>>> > >>>>> > >>>>>> +class Elf_Phdr: > >>>>>> + def __init__(self, e_ident): > >>>>>> + endian, addr, off = elf_types_fmts(e_ident) > >>>>>> + self.ei_class = e_ident[EI_CLASS] > >>>>>> + if self.ei_class == ELFCLASS32: > >>>>>> + self.fmt = '{0}I{2}{1}{1}IIII'.format(endian, addr, off) > >>>>>> + else: > >>>>>> + self.fmt = '{0}II{2}{1}{1}QQQ'.format(endian, addr, off) > >>>>>> + self.len = struct.calcsize(self.fmt) > >>>>>> + > >>>>>> + def read(self, f): > >>>>>> + buf = f.read(self.len) > >>>>>> + if not buf: > >>>>>> + error('{}: program header too small'.format(f.name)) > >>>>> > >>>>> Here as well. > >>>> > >>>> Ack. > >>>> > >>>>> > >>>>> Rest looks okay. > >>>> > >>>> Thanks, I push it upstream with the above fixes installed. > >>> > >>> I got > >>> > >>> FAIL: elf/tst-p_align3 > >>> > >>> [hjl@gnu-tgl-2 build-x86_64-linux]$ cat elf/tst-p_align3.out > >>> /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/elf/tst-p_align3: > >>> error while loading shared libraries: > >>> /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/elf/tst-p_alignmod3.so: > >>> cannot change memory protections > >>> [hjl@gnu-tgl-2 build-x86_64-linux]$ > >>> > >>> Only p_align should be changed to 0x100. But I saw > >> > >> I am not sure if this is related because tst-p_align3 and tst-alignmod3.so uses > >> LDFLAGS instead: > >> > >> 1644 $(objpfx)tst-align3: $(objpfx)tst-alignmod3.so > >> 1645 ifeq (yes,$(have-fpie)) > >> 1646 CFLAGS-tst-align3.c += $(PIE-ccflag) > >> 1647 endif > >> 1648 LDFLAGS-tst-align3 += -Wl,-z,max-page-size=0x200000 > >> 1649 LDFLAGS-tst-alignmod3.so += -Wl,-z,max-page-size=0x200000 > >> 1650 $(objpfx)tst-alignmod3.so: $(libsupport) > >> > >> And the patch only changed the way tst-p_align1 and tst-p_align2 modules were > >> changed. > > > > It is tst-p_alignmod3.so, not tst-alignmod3.so. > > ^^ > My confusion here. But even though the script in not involved: > > 2622 LDFLAGS-tst-p_alignmod3.so += -Wl,-z,max-page-size=0x100,-z,common-page-size=0x100 > 2623 > 2624 $(objpfx)tst-p_align3: $(objpfx)tst-p_alignmod3.so > 2625 $(objpfx)tst-p_align3.out: tst-p_align3.sh $(objpfx)tst-p_align3 > 2626 $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \ > 2627 $(evaluate-test) > > That's why it is puzzling me that it start to fail now. This test checks the invalid p_align handling. You have to edit the binary to change p_align to 0x100 which is invalid. -- H.J.