From patchwork Tue Dec 21 15:14:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 49153 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BC74C3858006 for ; Tue, 21 Dec 2021 15:14:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BC74C3858006 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1640099697; bh=vzudlVICs35gnMSFQrpfR81AVXPAPeU/mcMd6Q1yirc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=E6w/Jx0FAks4vQxkJjmDX+M6xzpt1aPjODvvTHHN4nsXyN0KC3AEDeMJC+wN5xxLe SzvfSsLe0VZUUhvcYFrrwFwXjg22yJaeAy3UPfz7VJjKPGN+LzfCyHq0xvADrwEykW K75Flw9rjsyhyo2lrkAZYjaiqIg3l+AqrIVg9+R4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by sourceware.org (Postfix) with ESMTPS id 9B4583858C2C for ; Tue, 21 Dec 2021 15:14:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9B4583858C2C Received: by mail-pl1-x636.google.com with SMTP id q17so10982225plr.11 for ; Tue, 21 Dec 2021 07:14:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=vzudlVICs35gnMSFQrpfR81AVXPAPeU/mcMd6Q1yirc=; b=v2T7lP0lU5JFIVmu//9sWFaLDAKzOp+N1vfXuujy6qIYiExO1r3TUBLsZDaSK+41ZW uh7p4ZV/VvnE+S1NXODT8OjhSwoWcO35Cb0CronA5RUbaePGdI4+ofeUF7diNnGB+3rE bX10+1YSipzsoq6jPB40R8KNT8NtMGIHh70APkWOk+EmxwanC2zaEjWkgNChDG5xqN1k qD/POjx9sBeOlRtNnD6riBk6pysv++Xpy6UVBsBQACsMKm7mddh4eRIePTmcm2DQSdq+ Z3rp0g2ZmBaTrDQSLiaOMPRWhiF4MJllR3MJuY7mgwIVPK7hHa9M5d2S/IozM63eViYh uXCw== X-Gm-Message-State: AOAM530+dqwFsje6+kdJ8chHeM92tiUvuPZvDytEq9Aoe0gOw6RMmmg6 ipVVdMIJBMp9NGh2EweMCkV7UECnAYk= X-Google-Smtp-Source: ABdhPJwpc3B5AUDMiSWzyQd0zhk+BLWpxi7hQR9OdY+cjaUmzCY5/DfPKfF/RCHhnDu/ci6L6LnJjw== X-Received: by 2002:a17:902:b197:b0:148:a2e7:fb4d with SMTP id s23-20020a170902b19700b00148a2e7fb4dmr3651632plr.142.1640099674523; Tue, 21 Dec 2021 07:14:34 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id m3sm2940474pjz.10.2021.12.21.07.14.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 07:14:34 -0800 (PST) Received: from gnu-tgl-2.localdomain (gnu-tgl-2 [192.168.1.42]) by gnu-tgl-3.localdomain (Postfix) with ESMTPS id 0B29BC0722 for ; Tue, 21 Dec 2021 07:14:33 -0800 (PST) Received: from gnu-tgl-2.. (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id 4B24F3003DA for ; Tue, 21 Dec 2021 07:14:29 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v5 1/2] elf: Properly align all PT_LOAD segments [BZ #28676] Date: Tue, 21 Dec 2021 07:14:28 -0800 Message-Id: <20211221151429.1596402-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3029.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, 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-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Linker may set p_align of a PT_LOAD segment larger than p_align of the first PT_LOAD segment to satisfy a section alignment: Elf file type is DYN (Shared object file) Entry point 0x0 There are 10 program headers, starting at offset 64 Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flags Align LOAD 0x0000000000000000 0x0000000000000000 0x0000000000000000 0x0000000000000834 0x0000000000000834 R E 0x1000 LOAD 0x0000000000000e00 0x0000000000001e00 0x0000000000001e00 0x0000000000000230 0x0000000000000230 RW 0x1000 LOAD 0x0000000000400000 0x0000000000400000 0x0000000000400000 0x0000000000000004 0x0000000000000008 RW 0x400000 ... Section to Segment mapping: Segment Sections... 00 .note.gnu.property .note.gnu.build-id .gnu.hash .dynsym .dynstr .gnu.version .gnu.version_r .rela.dyn .rela.plt .init .plt .plt.got .text .fini .rodata .eh_frame_hdr .eh_frame 01 .init_array .fini_array .data.rel.ro .dynamic .got .got.plt 02 .data .bss We should align the first PT_LOAD segment to the maximum p_align of all PT_LOAD segments, similar to the kernel commit: commit ce81bb256a224259ab686742a6284930cbe4f1fa Author: Chris Kennelly Date: Thu Oct 15 20:12:32 2020 -0700 fs/binfmt_elf: use PT_LOAD p_align values for suitable start address --- elf/dl-load.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/elf/dl-load.c b/elf/dl-load.c index 721593135e..e61515771a 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1101,6 +1101,7 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, size_t nloadcmds = 0; bool has_holes = false; bool empty_dynamic = false; + ElfW(Addr) p_align_max = 0; /* The struct is initialized to zero so this is not necessary: l->l_ld = 0; @@ -1151,7 +1152,9 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, c->mapend = ALIGN_UP (ph->p_vaddr + ph->p_filesz, GLRO(dl_pagesize)); c->dataend = ph->p_vaddr + ph->p_filesz; c->allocend = ph->p_vaddr + ph->p_memsz; - c->mapalign = ph->p_align; + /* Remember the maximum p_align. */ + if (ph->p_align > p_align_max) + p_align_max = ph->p_align; c->mapoff = ALIGN_DOWN (ph->p_offset, GLRO(dl_pagesize)); /* Determine whether there is a gap between the last segment @@ -1226,6 +1229,10 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, goto lose; } + /* Align all PT_LOAD segments to the maximum p_align. */ + for (size_t i = 0; i < nloadcmds; i++) + loadcmds[i].mapalign = p_align_max; + /* dlopen of an executable is not valid because it is not possible to perform proper relocations, handle static TLS, or run the ELF constructors. For PIE, the check needs the dynamic