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; } From patchwork Tue Dec 21 21:54:37 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: 49164 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 40C063858405 for ; Tue, 21 Dec 2021 21:57:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 40C063858405 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1640123833; bh=VPmE4cYQ41SuEUymJZpUABO4cDdQdiEKQV5RVChEMS4=; 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=mC+r/v2XqvZmqZZcdpBoVgxM6qSXbw+EU7CIhh/4odV3Oz0bSDiZ0azSE2+R0qSkz 3svgm2ELDRc3+zREee3ZCmHl88TdletsxBaDDJ4sv52DGAPsbwOlt11uSxbDYAaKT1 t2MGDymk9k1uamtaEmrIO2DSCPtjmv0AvqjBzEnQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by sourceware.org (Postfix) with ESMTPS id E35C13858C3A for ; Tue, 21 Dec 2021 21:54:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E35C13858C3A Received: by mail-pj1-x1034.google.com with SMTP id b1-20020a17090a990100b001b14bd47532so580121pjp.0 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=VPmE4cYQ41SuEUymJZpUABO4cDdQdiEKQV5RVChEMS4=; b=QvP+lJ04b9eM2y0GLLwTcDJNs1FEPyreTXpKPs2zLL/apExirUtVEKNhgQl+yRle4x Ox5jhtcGNQFwaSXVrA9f9j977F6BYSdunoHkUGQ0SoJzr05CTns8eExaZk7/ilBb72cA iZ14rP66np2oWzGTsxjsaQ55Csd6QR2bhtKDtdlzoTQn6wJWNo6F8iJRUrVfZDEfoPp5 DdJDRjZCs4xW8hZxxG/ptwIUo/ZnMkdPVk2vESiadPfWaWAYxF6UdP4wVw+zb+qVf836 dwZGP4NPMjLtowhfLurFkVL+djNZtjZU5DLgiGroTu7H4g2vBut6IvkEw2ETCe1QweOM 6ECg== X-Gm-Message-State: AOAM530sVLN5h5VA4zS7gkOYnkDXgF6wnwiYWOfPJWVR+WBC+J5OW40I frW0L0bcYnsljN3/besd8R5yzDrdPTs= X-Google-Smtp-Source: ABdhPJxsA+9+xKciTEkpGuJInmmFqsjFD/T+KZkqdMDd/CfOhqqpvRrRtsVFkEUYWf0Ls1Agrrv1bA== X-Received: by 2002:a17:90a:d191:: with SMTP id fu17mr218923pjb.73.1640123684037; Tue, 21 Dec 2021 13:54:44 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id y37sm51093pga.78.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 4C87CC042C; 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 92BF13003DC; Tue, 21 Dec 2021 13:54:38 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 2/3] elf: Add a test for PT_LOAD segments with p_align == 1 [BZ #28688] Date: Tue, 21 Dec 2021 13:54:37 -0800 Message-Id: <20211221215438.3084053-3-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, KAM_SHORT, 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" Add tst-p_alignmod2-edit to edit the copy of tst-alignmod3.so to set p_align of the first PT_LOAD segment to 1 and verify that the shared library can be loaded normally. --- elf/Makefile | 13 +++++++++++++ elf/tst-p_align2.c | 27 +++++++++++++++++++++++++++ elf/tst-p_alignmod2-edit.c | 27 +++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 elf/tst-p_align2.c create mode 100644 elf/tst-p_alignmod2-edit.c diff --git a/elf/Makefile b/elf/Makefile index 6435fb0022..3831b991a4 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -381,7 +381,9 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ ifeq (yes,$(build-shared)) tests += \ tst-p_alignmod1-edit \ + tst-p_alignmod2-edit \ tst-p_align1 \ + tst-p_align2 \ endif @@ -2013,3 +2015,14 @@ $(objpfx)tst-p_alignmod1.so: $(objpfx)tst-p_alignmod1-edit \ cp $(objpfx)tst-alignmod3.so $@ $(test-wrapper-env) $(run-program-env) $(rtld-prefix) \ $(objpfx)tst-p_alignmod1-edit $@ + +$(objpfx)tst-p_align2: $(objpfx)tst-p_alignmod2.so + +# Make a copy of tst-alignmod3.so and update p_align of the first PT_LOAD +# segment. +$(objpfx)tst-p_alignmod2.so: $(objpfx)tst-p_alignmod2-edit \ + $(objpfx)tst-alignmod3.so + rm -f $@ + cp $(objpfx)tst-alignmod3.so $@ + $(test-wrapper-env) $(run-program-env) $(rtld-prefix) \ + $(objpfx)tst-p_alignmod2-edit $@ diff --git a/elf/tst-p_align2.c b/elf/tst-p_align2.c new file mode 100644 index 0000000000..cab9793220 --- /dev/null +++ b/elf/tst-p_align2.c @@ -0,0 +1,27 @@ +/* Check different alignments of PT_LOAD segments in a shared library. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +extern int do_load_test (void); + +static int +do_test (void) +{ + return do_load_test (); +} + +#include diff --git a/elf/tst-p_alignmod2-edit.c b/elf/tst-p_alignmod2-edit.c new file mode 100644 index 0000000000..2f47b37c9e --- /dev/null +++ b/elf/tst-p_alignmod2-edit.c @@ -0,0 +1,27 @@ +/* Set p_align of the first PT_LOAD segment to 1. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include "tst-elf-edit.h" + +/* Set p_align to 1. */ + +static size_t +update_p_align (size_t p_align __attribute__ ((unused))) +{ + return 1; +} From patchwork Tue Dec 21 21:54:38 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: 49162 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 82C8A3858406 for ; Tue, 21 Dec 2021 21:55:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 82C8A3858406 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1640123748; bh=eY2nd1J7msAI7uD/At3h0btMFJLJj1jrK/RM2MqB9L4=; 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=K8hGvcdYGyn5f3Em7RMl4uUZUL26j7mTuqwqcmusm9TqQs8CgyYt4h9qxWhPA22SY hYjuZGa0kg0bGI+j/2FAtLY1KHCyiqRP8cVFTfmvm0UFYGYd1excI5mh3kkRInzJpy mIHFTi35i9Yaetzl/BXHBiHhSJu3lM/v53C0tQJs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by sourceware.org (Postfix) with ESMTPS id AF3CA3858401 for ; Tue, 21 Dec 2021 21:54:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AF3CA3858401 Received: by mail-pl1-x62c.google.com with SMTP id y7so326263plp.0 for ; Tue, 21 Dec 2021 13:54:45 -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=eY2nd1J7msAI7uD/At3h0btMFJLJj1jrK/RM2MqB9L4=; b=Km6CwxoZXAQSqFo2EV9YzBbtHED1MlQ/GM/GQpxxeKhzXKj1LgPCr6pfgXSGRycvZN a1MEqSJEa/qzAUES3UZj7+moXOFLaCr9iS4387WLpOt0st34LEJTqBqMsWVj534SbsxV OGX4VCuh1KBzYwrAhD2Nm/fkg37jZ0O1IZw3X5zyaZtc1ESeOfxouk/PE5MyaPK5/xI4 euk1ur8otYRK6MNOJrY3NkVyHMaP6WvOCKgtfG14m8+7lX9wxYLe7Zl8zPZVRFAf/riQ eSNPJpPuhBz7szOy3Vil/mz7ZgDcqMRRQ3xKlBBqcR585njW9wpC2Qb2ltX0pigHo/3m +lGg== X-Gm-Message-State: AOAM5311HD9zG++lEpekph2xBizfN+xee1mNHsi7ZALBobVRwniTSYT3 DwoobEoKfgkdCTKgeW1tO1PoVbBcfso= X-Google-Smtp-Source: ABdhPJxmbsGhReaA2WgFb5KdRCODYUvZYtqq+anemC9+hldQxJJearJ/liwdHdSkWeNfvJSfFbQBLw== X-Received: by 2002:a17:90a:d498:: with SMTP id s24mr501394pju.46.1640123684833; Tue, 21 Dec 2021 13:54:44 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id t12sm3424657pjo.44.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 4D98AC072B; 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 93A593003DD; Tue, 21 Dec 2021 13:54:38 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 3/3] elf: Add a test for PT_LOAD segments with invalid p_align [BZ #28688] Date: Tue, 21 Dec 2021 13:54:38 -0800 Message-Id: <20211221215438.3084053-4-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, KAM_SHORT, 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" Build tst-p_alignmod3.so with 256 byte page size and verify that it is rejected with a proper error message. --- elf/Makefile | 13 +++++++++++++ elf/tst-p_align3.c | 27 +++++++++++++++++++++++++++ elf/tst-p_align3.sh | 26 ++++++++++++++++++++++++++ elf/tst-p_alignmod3.c | 22 ++++++++++++++++++++++ 4 files changed, 88 insertions(+) create mode 100644 elf/tst-p_align3.c create mode 100755 elf/tst-p_align3.sh create mode 100644 elf/tst-p_alignmod3.c diff --git a/elf/Makefile b/elf/Makefile index 3831b991a4..f18c94f71b 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -385,6 +385,12 @@ tests += \ tst-p_align1 \ tst-p_align2 \ +tests-special += \ + $(objpfx)tst-p_align3.out \ + +modules-names += \ + tst-p_alignmod3 \ + endif # Most modules build with _ISOMAC defined, but those filtered out @@ -2026,3 +2032,10 @@ $(objpfx)tst-p_alignmod2.so: $(objpfx)tst-p_alignmod2-edit \ cp $(objpfx)tst-alignmod3.so $@ $(test-wrapper-env) $(run-program-env) $(rtld-prefix) \ $(objpfx)tst-p_alignmod2-edit $@ + +LDFLAGS-tst-p_alignmod3.so += -Wl,-z,max-page-size=0x100,-z,common-page-size=0x100 + +$(objpfx)tst-p_align3: $(objpfx)tst-p_alignmod3.so +$(objpfx)tst-p_align3.out: tst-p_align3.sh $(objpfx)tst-p_align3 + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \ + $(evaluate-test) diff --git a/elf/tst-p_align3.c b/elf/tst-p_align3.c new file mode 100644 index 0000000000..61c616ac3b --- /dev/null +++ b/elf/tst-p_align3.c @@ -0,0 +1,27 @@ +/* Check invalid p_align of PT_LOAD segments in a shared library. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +extern int do_load_test (void); + +static int +do_test (void) +{ + return do_load_test (); +} + +#include diff --git a/elf/tst-p_align3.sh b/elf/tst-p_align3.sh new file mode 100755 index 0000000000..11572aa217 --- /dev/null +++ b/elf/tst-p_align3.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# Check invalid p_align of PT_LOAD segments in a shared library. +# Copyright (C) 2021 Free Software Foundation, Inc. +# This file is part of the GNU C Library. + +# The GNU C Library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# The GNU C Library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser General Public +# License along with the GNU C Library; if not, see +# . + +common_objpfx=$1; shift +test_program_prefix=$1; shift + +${test_program_prefix} \ + ${common_objpfx}elf/tst-p_align3 \ + 2> ${common_objpfx}elf/tst-p_align3.out && exit 1 +grep "ELF load command address/offset not page-aligned" ${common_objpfx}elf/tst-p_align3.out diff --git a/elf/tst-p_alignmod3.c b/elf/tst-p_alignmod3.c new file mode 100644 index 0000000000..90f3af467e --- /dev/null +++ b/elf/tst-p_alignmod3.c @@ -0,0 +1,22 @@ +/* Check invalid p_align of PT_LOAD segment in a shared library. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +void +do_load_test (void) +{ +}