From patchwork Fri Jan 21 21:12:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 50339 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 D371E3858434 for ; Fri, 21 Jan 2022 21:13:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D371E3858434 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1642799634; bh=Jur/A8hKub41+Lde62kg2xvuIhlNmka0WeH/2my/gSA=; 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=h1G7ITr+16gRNHzeSr6Dej5ipu7PaqLfJ2WMxD4vNC1PP8sBHQG/ZZI+5MhuKKo6s mFvAfdGxLFmxEQ35aMA7AzUxVaNCzI1No6Rj21WLkzo8ta88bJyU/Qr61VeubHlJoH sESRk55fGPtk14BRMvlwzt309Z5Vi6Xp32sv/ZUk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by sourceware.org (Postfix) with ESMTPS id AF87F3858C3A for ; Fri, 21 Jan 2022 21:12:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AF87F3858C3A Received: by mail-pg1-x52f.google.com with SMTP id p125so9150434pga.2 for ; Fri, 21 Jan 2022 13:12:08 -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=Jur/A8hKub41+Lde62kg2xvuIhlNmka0WeH/2my/gSA=; b=VQWJDwIIAnGzIwNc0PglK10I9KZd6sDgOBDqb7XDth96nBbql68EK54aR4Ux9Om3Hw JRYi1Fpr+dYp3yeeC2x76DudR0/plakQwbrEzp/5hb1F7Y6lVDv9qtfESj6Kugc/6cqO mvWY8ocOtBdow/yNVjrgtIyF+Ly5EowYFJ3eF1sQDN5lFAKawkJoSYNAGS/AoK3CmKPf PLIXT0AA0BJJ0UqzVxT02ADw+B0weMJiUIqu3cnksamRTW1Uq8CyfVnpIvyJtjPZTq1f mZkYfC2ipRdYHaE0UukDimvBALgAaGrJ8fQnJJtcyW0EWJkFNq9atd1uTvMPeqwWN+Gd RYag== X-Gm-Message-State: AOAM533Yi2FErbuyp2A+oYnn0NA3dmvXsgfhlKIs7RZWkitOeJ2lLiX4 KeoLiSv8k/KzVP2seuIlpdg= X-Google-Smtp-Source: ABdhPJy70gvuGC0CJk2EtqRFf1d5d2UdblG+hbX2W5DO+7EU2VMNw+hS/kmaSH2TZfYlJUwfYRlFxw== X-Received: by 2002:a05:6a00:24c9:b0:4bb:ffe2:17c2 with SMTP id d9-20020a056a0024c900b004bbffe217c2mr2856338pfv.31.1642799527727; Fri, 21 Jan 2022 13:12:07 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id t17sm8234138pfg.207.2022.01.21.13.12.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:12:06 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 4FF6FC14F6; Fri, 21 Jan 2022 13:12:05 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v9 3/3] elf: Add a test for PT_LOAD segments with invalid p_align [BZ #28688] Date: Fri, 21 Jan 2022 13:12:05 -0800 Message-Id: <20220121211205.268178-4-hjl.tools@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121211205.268178-1-hjl.tools@gmail.com> References: <20220121211205.268178-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3028.9 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. Reviewed-by: Adhemerval Zanella --- elf/Makefile | 9 +++++++++ elf/tst-p_align3.c | 27 +++++++++++++++++++++++++++ elf/tst-p_align3.sh | 27 +++++++++++++++++++++++++++ elf/tst-p_alignmod3.c | 25 +++++++++++++++++++++++++ 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 c63abab44b..ad1c0ea7b6 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -416,6 +416,7 @@ tests += \ tst-p_alignmod2-edit \ tst-p_align1 \ tst-p_align2 \ + tst-p_align3 \ tst-relsort1 \ tst-ro-dynamic \ tst-rtld-run-static \ @@ -733,6 +734,7 @@ modules-names = \ tst-nodelete-opened-lib \ tst-null-argv-lib \ tst-p_alignmod-base \ + tst-p_alignmod3 \ tst-relsort1mod1 \ tst-relsort1mod2 \ tst-ro-dynamic-mod \ @@ -2608,3 +2610,10 @@ $(objpfx)tst-p_alignmod2.so: $(objpfx)tst-p_alignmod2-edit \ cp $(objpfx)tst-p_alignmod-base.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..8be9f311bd --- /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) 2022 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-p_align.h" + +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..688c4b34cc --- /dev/null +++ b/elf/tst-p_align3.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# Check invalid p_align of PT_LOAD segments in a shared library. +# Copyright (C) 2022 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 +test $? -ne 127 && 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..c15de3d6f2 --- /dev/null +++ b/elf/tst-p_alignmod3.c @@ -0,0 +1,25 @@ +/* Check invalid p_align of PT_LOAD segment in a shared library. + Copyright (C) 2022 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-p_align.h" + +int +do_load_test (void) +{ + return 0; +}