From patchwork Wed Jan 5 04:45:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 49543 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 7E5BE3858427 for ; Wed, 5 Jan 2022 04:45:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7E5BE3858427 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1641357956; bh=0IJRqFiWIUxXMEnB9YTDwgyVL/TKciQe+nLVTavY14k=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ENp9G/SnMw9OCRPL/i/lGXSNhStAIYK0eGzbdhOgnNTWB7c50KeE19wUcyVk9YoYo 6NASptQ2ASXx1MbFO2ZzWbqbMPspvdBAqnuK+3x3KGDjQPYiYxg0pgPVikarB08O3b Oy5yy9YVGlPFVeSwQgOz72yxELmkUF2b7ZzecGOw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from dormouse.elm.relay.mailchannels.net (dormouse.elm.relay.mailchannels.net [23.83.212.50]) by sourceware.org (Postfix) with ESMTPS id 7E07E3858C2C for ; Wed, 5 Jan 2022 04:45:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7E07E3858C2C X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 599AC216B8 for ; Wed, 5 Jan 2022 04:45:34 +0000 (UTC) Received: from pdx1-sub0-mail-a305.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 0319121706 for ; Wed, 5 Jan 2022 04:45:34 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a305.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.99.165.222 (trex/6.4.3); Wed, 05 Jan 2022 04:45:34 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Harbor-Desert: 3f3b823f44252ce8_1641357934223_2219407340 X-MC-Loop-Signature: 1641357934223:1202961934 X-MC-Ingress-Time: 1641357934223 Received: from rhbox.redhat.com (unknown [1.186.123.58]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a305.dreamhost.com (Postfix) with ESMTPSA id 4JTH3c4bdTz2m for ; Tue, 4 Jan 2022 20:45:32 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 0/2] _FORTIFY_SOURCE fixes [BZ #28746] Date: Wed, 5 Jan 2022 10:15:14 +0530 Message-Id: <20220105044516.905688-1-siddhesh@sourceware.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220105013946.2646963-1-siddhesh@sourceware.org> References: <20220105013946.2646963-1-siddhesh@sourceware.org> MIME-Version: 1.0 X-Spam-Status: No, score=-3487.6 required=5.0 tests=BAYES_00, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL, SPF_HELO_NONE, SPF_NEUTRAL, TXREP autolearn=no 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: Siddhesh Poyarekar via Libc-alpha From: Siddhesh Poyarekar Reply-To: Siddhesh Poyarekar Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The main patch is 2/2, which fixes some fortified headers to match feature macros with their corresponding main headers, without which functions would fail to get fortified. Patch 1/2 is a restructuring of the tests so that it is easier to add different configurations to _FORTIFY_SOURCE tests at various levels. Tested on x86_64 to confirm that there were no new regressions due to this and that the new tests also run clean. Changes from v1: - Rebased against latest trunk so that the patches actually apply. - Renamed files so that the diffs are easier to compare and also make a bit more sense. Siddhesh Poyarekar (2): debug: Refactor and expand _FORTIFY_SOURCE tests debug: Synchronize feature guards in fortified functions [BZ #28746] debug/Makefile | 80 ++++++++++---------- debug/{tst-lfschk1.c => tst-chk-0-cc-lfs.cc} | 2 +- debug/tst-chk-0-cc-nongnu.cc | 3 + debug/tst-chk-0-cc.cc | 1 + debug/{tst-lfschk2.c => tst-chk-0-lfs.c} | 2 +- debug/tst-chk-0-nongnu.c | 3 + debug/{tst-chk1.c => tst-chk-0.c} | 49 ++++++++++-- debug/{tst-lfschk3.c => tst-chk-1-cc-lfs.cc} | 2 +- debug/tst-chk-1-cc-nongnu.cc | 3 + debug/{tst-chk5.cc => tst-chk-1-cc.cc} | 2 +- debug/{tst-lfschk4.cc => tst-chk-1-lfs.c} | 2 +- debug/tst-chk-1-nongnu.c | 3 + debug/{tst-chk2.c => tst-chk-1.c} | 2 +- debug/tst-chk-2-cc-lfs.cc | 2 + debug/tst-chk-2-cc-nongnu.cc | 3 + debug/{tst-chk6.cc => tst-chk-2-cc.cc} | 2 +- debug/tst-chk-2-lfs.c | 2 + debug/tst-chk-2-nongnu.c | 3 + debug/{tst-chk3.c => tst-chk-2.c} | 2 +- debug/tst-chk-3-cc-lfs.cc | 2 + debug/tst-chk-3-cc-nongnu.cc | 3 + debug/{tst-chk7.c => tst-chk-3-cc.cc} | 2 +- debug/tst-chk-3-lfs.c | 2 + debug/tst-chk-3-nongnu.c | 3 + debug/{tst-chk8.cc => tst-chk-3.c} | 2 +- debug/tst-chk4.cc | 1 - debug/tst-lfschk5.cc | 2 - debug/tst-lfschk6.cc | 2 - posix/bits/unistd.h | 2 +- string/bits/string_fortified.h | 8 +- support/xsignal.h | 2 + wcsmbs/bits/wchar2.h | 2 +- 32 files changed, 131 insertions(+), 70 deletions(-) rename debug/{tst-lfschk1.c => tst-chk-0-cc-lfs.cc} (55%) create mode 100644 debug/tst-chk-0-cc-nongnu.cc create mode 100644 debug/tst-chk-0-cc.cc rename debug/{tst-lfschk2.c => tst-chk-0-lfs.c} (55%) create mode 100644 debug/tst-chk-0-nongnu.c rename debug/{tst-chk1.c => tst-chk-0.c} (97%) rename debug/{tst-lfschk3.c => tst-chk-1-cc-lfs.cc} (55%) create mode 100644 debug/tst-chk-1-cc-nongnu.cc rename debug/{tst-chk5.cc => tst-chk-1-cc.cc} (53%) rename debug/{tst-lfschk4.cc => tst-chk-1-lfs.c} (55%) create mode 100644 debug/tst-chk-1-nongnu.c rename debug/{tst-chk2.c => tst-chk-1.c} (53%) create mode 100644 debug/tst-chk-2-cc-lfs.cc create mode 100644 debug/tst-chk-2-cc-nongnu.cc rename debug/{tst-chk6.cc => tst-chk-2-cc.cc} (53%) create mode 100644 debug/tst-chk-2-lfs.c create mode 100644 debug/tst-chk-2-nongnu.c rename debug/{tst-chk3.c => tst-chk-2.c} (53%) create mode 100644 debug/tst-chk-3-cc-lfs.cc create mode 100644 debug/tst-chk-3-cc-nongnu.cc rename debug/{tst-chk7.c => tst-chk-3-cc.cc} (53%) create mode 100644 debug/tst-chk-3-lfs.c create mode 100644 debug/tst-chk-3-nongnu.c rename debug/{tst-chk8.cc => tst-chk-3.c} (53%) delete mode 100644 debug/tst-chk4.cc delete mode 100644 debug/tst-lfschk5.cc delete mode 100644 debug/tst-lfschk6.cc