From patchwork Tue Dec 21 21:54:36 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: 49161 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 155453858C60 for ; Tue, 21 Dec 2021 21:55:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 155453858C60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1640123706; bh=BolNrRaeX+J6n5EM01KGQhJzu73MFXGw45z37efTmy0=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=obHMaDp9qnoZ894yg+GDXo2B5NjFtqg0q67wqWwObICC0lU840wEbFfF1NfWBDrnF bjDBxrlldsLj/f09cmvpCLulpCSEBKDMa9+J9X0zZaa6KNpss/uqKC59OA19HI5ZHD cF0P/1uei3R1vJT5t0/XtUPSXZZspQnAJKEM7xY4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by sourceware.org (Postfix) with ESMTPS id 98A703858C60 for ; Tue, 21 Dec 2021 21:54:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 98A703858C60 Received: by mail-pl1-x62b.google.com with SMTP id w24so268392ply.12 for ; Tue, 21 Dec 2021 13:54:44 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BolNrRaeX+J6n5EM01KGQhJzu73MFXGw45z37efTmy0=; b=BWZ7L0jMdvO5IUP+eGNTmN85oYzJcISgPkxrmd+dWCybXBZjLxauAdEdsd1PJQPlD3 Q9Y69ebK4skL6NvfJKpOeIwmMljR4xu3O5yOUlQy7DMqVJP/S20ARLKfONCP4UzewSTm IaeqdfczQrsb99lMdIwNDo8QuC3qmolACMPKPZ+3gjuZMlANeqgktVcy6R4Mwy0IinWl UKxAMEkZb1pUFGmnSzfbA+LkCB0XedKjxrIw7zBlO3GGFGu5UCGAtmJOLQQaPkjKJsDD 4eZexhcVCDGxc+yIR46YnUIvc3gq5w/p0xglHMawwuO4aF09JPJK7eU1yHqmQQiqDnPR j/pw== X-Gm-Message-State: AOAM5332Ymbt+M7Svr4FxO7d9tFht1wKOhm/0HfJZgDebXPNsZtZt8eh LiUq52XSftodap63ZLziohG8hD5crVQ= X-Google-Smtp-Source: ABdhPJyG8C2o4/vJFQiIEjz0E48lCM64+tD/cGRG+qJyFf/geJY2eeGjPgOt7b6mmRe81IZZH2RqPA== X-Received: by 2002:a17:90a:fb83:: with SMTP id cp3mr446475pjb.111.1640123683733; Tue, 21 Dec 2021 13:54:43 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id a16sm54928pgm.57.2021.12.21.13.54.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 13:54:43 -0800 (PST) Received: from gnu-tgl-2.localdomain (gnu-tgl-2 [192.168.1.42]) by gnu-tgl-3.localdomain (Postfix) with ESMTPS id 4D722C0722; Tue, 21 Dec 2021 13:54:42 -0800 (PST) Received: from gnu-tgl-2.. (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id 91F6B3003DB; Tue, 21 Dec 2021 13:54:38 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 1/3] elf: Remove excessive p_align check on PT_LOAD segments [BZ #28688] Date: Tue, 21 Dec 2021 13:54:36 -0800 Message-Id: <20211221215438.3084053-2-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211221215438.3084053-1-hjl.tools@gmail.com> References: <20211221215438.3084053-1-hjl.tools@gmail.com> 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" Cc: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" p_align does not have to be a multiple of the page size. Only PT_LOAD segment layout should be aligned to the page size. 1: Remove p_align check against the page size. 2. Use the page size, instead of p_align, to check PT_LOAD segment layout. Reviewed-by: Florian Weimer --- elf/dl-load.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c index e61515771a..8d89ab81d1 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1134,16 +1134,11 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, case PT_LOAD: /* A load command tells us to map in part of the file. We record the load commands and process them all later. */ - if (__glibc_unlikely ((ph->p_align & (GLRO(dl_pagesize) - 1)) != 0)) - { - errstring = N_("ELF load command alignment not page-aligned"); - goto lose; - } if (__glibc_unlikely (((ph->p_vaddr - ph->p_offset) - & (ph->p_align - 1)) != 0)) + & (GLRO(dl_pagesize) - 1)) != 0)) { errstring - = N_("ELF load command address/offset not properly aligned"); + = N_("ELF load command address/offset not page-aligned"); goto lose; }