From patchwork Wed Jan 5 04:45:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 49544 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 4B896385840A for ; Wed, 5 Jan 2022 04:46:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4B896385840A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1641357999; bh=LmhIzsy/mONfbeiDwpOdjX2peKCQO6fsRD4kAaeJ3eI=; 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=rQ87TuqTUUA34/axGzhlrnlFdI+gE9cVbCuf8NVtLIj9jlijxjTP+u1QvuDym73Wv jS5kfnkjL/7LaDbFUgxkT6DBQA5Zb3pm3J/oEQuyoTqPxkTbZi1/APNM5bw25jnjfj ha0JlhJPDksdssjcz9PYFveaUESFLtR6Q0IJCzqA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from eastern.birch.relay.mailchannels.net (eastern.birch.relay.mailchannels.net [23.83.209.55]) by sourceware.org (Postfix) with ESMTPS id 9ACB73858C2C for ; Wed, 5 Jan 2022 04:45:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9ACB73858C2C 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 8AFA682107C for ; Wed, 5 Jan 2022 04:45:37 +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 F1CAA821050 for ; Wed, 5 Jan 2022 04:45:36 +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.100.11.97 (trex/6.4.3); Wed, 05 Jan 2022 04:45:37 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Inform-Stupid: 160203643a7016a0_1641357937396_1113046486 X-MC-Loop-Signature: 1641357937396:218482749 X-MC-Ingress-Time: 1641357937396 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 4JTH3f4Bf7z1X for ; Tue, 4 Jan 2022 20:45:34 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 1/2] debug: Refactor and expand _FORTIFY_SOURCE tests Date: Wed, 5 Jan 2022 10:15:15 +0530 Message-Id: <20220105044516.905688-2-siddhesh@sourceware.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220105044516.905688-1-siddhesh@sourceware.org> References: <20220105013946.2646963-1-siddhesh@sourceware.org> <20220105044516.905688-1-siddhesh@sourceware.org> MIME-Version: 1.0 X-Spam-Status: No, score=-3494.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL, SPF_HELO_NONE, SPF_NEUTRAL, 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: 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" Rename all debug/tst-chk* tests to reflect the fortification level they're testing and any additional macros so that rules for them can be autogenerated. tst-chk0* are without fortification, tst-chk1 for _FORTIFY_SOURCE=1 and so on. This allows easier replication of the tests to check additional macros. The change also expands the -lfs to include _FORTIFY_SOURCE=3. Signed-off-by: Siddhesh Poyarekar --- debug/Makefile | 75 +++++++++----------- debug/{tst-lfschk1.c => tst-chk-0-cc-lfs.cc} | 2 +- debug/tst-chk-0-cc.cc | 1 + debug/{tst-lfschk2.c => tst-chk-0-lfs.c} | 2 +- debug/{tst-chk1.c => tst-chk-0.c} | 0 debug/{tst-lfschk3.c => tst-chk-1-cc-lfs.cc} | 2 +- debug/{tst-chk2.c => tst-chk-1-cc.cc} | 2 +- debug/{tst-lfschk4.cc => tst-chk-1-lfs.c} | 2 +- debug/{tst-chk5.cc => tst-chk-1.c} | 2 +- debug/tst-chk-2-cc-lfs.cc | 2 + debug/{tst-chk6.cc => tst-chk-2-cc.cc} | 2 +- debug/tst-chk-2-lfs.c | 2 + debug/{tst-chk3.c => tst-chk-2.c} | 2 +- debug/tst-chk-3-cc-lfs.cc | 2 + debug/{tst-chk7.c => tst-chk-3-cc.cc} | 2 +- debug/tst-chk-3-lfs.c | 2 + debug/{tst-chk8.cc => tst-chk-3.c} | 2 +- debug/tst-chk4.cc | 1 - debug/tst-lfschk5.cc | 2 - debug/tst-lfschk6.cc | 2 - 20 files changed, 52 insertions(+), 57 deletions(-) rename debug/{tst-lfschk1.c => tst-chk-0-cc-lfs.cc} (55%) create mode 100644 debug/tst-chk-0-cc.cc rename debug/{tst-lfschk2.c => tst-chk-0-lfs.c} (55%) rename debug/{tst-chk1.c => tst-chk-0.c} (100%) rename debug/{tst-lfschk3.c => tst-chk-1-cc-lfs.cc} (55%) rename debug/{tst-chk2.c => tst-chk-1-cc.cc} (53%) rename debug/{tst-lfschk4.cc => tst-chk-1-lfs.c} (55%) rename debug/{tst-chk5.cc => tst-chk-1.c} (53%) create mode 100644 debug/tst-chk-2-cc-lfs.cc rename debug/{tst-chk6.cc => tst-chk-2-cc.cc} (53%) create mode 100644 debug/tst-chk-2-lfs.c rename debug/{tst-chk3.c => tst-chk-2.c} (53%) create mode 100644 debug/tst-chk-3-cc-lfs.cc rename debug/{tst-chk7.c => tst-chk-3-cc.cc} (53%) create mode 100644 debug/tst-chk-3-lfs.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 diff --git a/debug/Makefile b/debug/Makefile index 9c2ce61a86..9aa27eb00c 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -1,4 +1,5 @@ # Copyright (C) 1998-2022 Free Software Foundation, Inc. +# Copyright The GNU Toolchain Authors. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -110,32 +111,31 @@ CFLAGS-tst-longjmp_chk3.c += -fexceptions -fasynchronous-unwind-tables CPPFLAGS-tst-longjmp_chk3.c += -D_FORTIFY_SOURCE=1 CPPFLAGS-tst-realpath-chk.c += -D_FORTIFY_SOURCE=2 +# _FORTIFY_SOURCE tests. +tests-chk = $(addprefix tst-chk-, 0 1 2 3) +tests-chk-cc = $(addsuffix -cc, $(tests-chk)) +tests-chk-lfs = $(addsuffix -lfs, $(tests-chk)) +tests-chk-cc-lfs = $(addsuffix -lfs, $(tests-chk-cc)) + # We know these tests have problems with format strings, this is what # we are testing. Disable that warning. They are also testing # deprecated functions (notably gets) so disable that warning as well. # And they also generate warnings from warning attributes, which # cannot be disabled via pragmas, so require -Wno-error to be used. -CFLAGS-tst-chk1.c += -Wno-format -Wno-deprecated-declarations -Wno-error -CFLAGS-tst-chk2.c += -Wno-format -Wno-deprecated-declarations -Wno-error -CFLAGS-tst-chk3.c += -Wno-format -Wno-deprecated-declarations -Wno-error -CFLAGS-tst-chk4.cc += -Wno-format -Wno-deprecated-declarations -Wno-error -CFLAGS-tst-chk5.cc += -Wno-format -Wno-deprecated-declarations -Wno-error -CFLAGS-tst-chk6.cc += -Wno-format -Wno-deprecated-declarations -Wno-error -CFLAGS-tst-chk7.c += -Wno-format -Wno-deprecated-declarations -Wno-error -CFLAGS-tst-chk8.cc += -Wno-format -Wno-deprecated-declarations -Wno-error -CFLAGS-tst-lfschk1.c += -Wno-format -Wno-deprecated-declarations -Wno-error -CFLAGS-tst-lfschk2.c += -Wno-format -Wno-deprecated-declarations -Wno-error -CFLAGS-tst-lfschk3.c += -Wno-format -Wno-deprecated-declarations -Wno-error -CFLAGS-tst-lfschk4.cc += -Wno-format -Wno-deprecated-declarations -Wno-error -CFLAGS-tst-lfschk5.cc += -Wno-format -Wno-deprecated-declarations -Wno-error -CFLAGS-tst-lfschk6.cc += -Wno-format -Wno-deprecated-declarations -Wno-error -LDLIBS-tst-chk4 = -lstdc++ -LDLIBS-tst-chk5 = -lstdc++ -LDLIBS-tst-chk6 = -lstdc++ -LDLIBS-tst-chk8 = -lstdc++ -LDLIBS-tst-lfschk4 = -lstdc++ -LDLIBS-tst-lfschk5 = -lstdc++ -LDLIBS-tst-lfschk6 = -lstdc++ +define disable-warnings +CFLAGS-$(1).$(2) += -Wno-format -Wno-deprecated-declarations -Wno-error +endef + +$(foreach t,$(tests-chk) $(tests-chk-lfs), \ + $(eval $(call disable-warnings,$(t),c))) + +$(foreach t,$(tests-chk-cc) $(tests-chk-cc-lfs), \ + $(eval $(call disable-warnings,$(t),cc))) + +define link-cc +LDLIBS-$(1) = -lstdc++ +endef +$(foreach t,$(tests-chk-cc) $(tests-chk-cc-lfs), $(eval $(call link-cc,$(t)))) # backtrace_symbols only works if we link with -rdynamic. backtrace # requires unwind tables on most architectures. @@ -152,19 +152,18 @@ LDFLAGS-tst-backtrace6 = -rdynamic CFLAGS-tst-ssp-1.c += -fstack-protector-all -tests = backtrace-tst tst-longjmp_chk tst-chk1 tst-chk2 tst-chk3 \ - tst-lfschk1 tst-lfschk2 tst-lfschk3 test-strcpy_chk test-stpcpy_chk \ - tst-chk4 tst-chk5 tst-chk6 tst-chk7 tst-chk8 tst-lfschk4 tst-lfschk5 \ - tst-lfschk6 tst-longjmp_chk2 tst-backtrace2 tst-backtrace3 \ - tst-backtrace4 tst-backtrace5 tst-backtrace6 tst-realpath-chk +tests = backtrace-tst tst-longjmp_chk \ + test-strcpy_chk test-stpcpy_chk \ + tst-longjmp_chk2 tst-backtrace2 tst-backtrace3 \ + tst-backtrace4 tst-backtrace5 tst-backtrace6 tst-realpath-chk \ + $(tests-chk) $(tests-chk-cc) $(tests-chk-lfs) $(tests-chk-cc-lfs) ifeq ($(have-ssp),yes) tests += tst-ssp-1 endif ifeq (,$(CXX)) -tests-unsupported = tst-chk4 tst-chk5 tst-chk6 tst-chk8 \ - tst-lfschk4 tst-lfschk5 tst-lfschk6 +tests-unsupported = $(tests-chk-cc) $(tests-chk-cc-lfs) endif extra-libs = libSegFault libpcprofile @@ -191,20 +190,12 @@ ifeq ($(run-built-tests),yes) LOCALES := de_DE.UTF-8 include ../gen-locales.mk -$(objpfx)tst-chk1.out: $(gen-locales) -$(objpfx)tst-chk2.out: $(gen-locales) -$(objpfx)tst-chk3.out: $(gen-locales) -$(objpfx)tst-chk4.out: $(gen-locales) -$(objpfx)tst-chk5.out: $(gen-locales) -$(objpfx)tst-chk6.out: $(gen-locales) -$(objpfx)tst-chk7.out: $(gen-locales) -$(objpfx)tst-chk8.out: $(gen-locales) -$(objpfx)tst-lfschk1.out: $(gen-locales) -$(objpfx)tst-lfschk2.out: $(gen-locales) -$(objpfx)tst-lfschk3.out: $(gen-locales) -$(objpfx)tst-lfschk4.out: $(gen-locales) -$(objpfx)tst-lfschk5.out: $(gen-locales) -$(objpfx)tst-lfschk6.out: $(gen-locales) +define chk-gen-locales +$(objpfx)$(1).out: $(gen-locales) +endef +$(foreach t, \ + $(tests-chk) $(tests-chk-cc) $(tests-chk-lfs) $(tests-chk-cc-lfs), \ + $(eval $(call link-cc,$(t)))) endif sLIBdir := $(shell echo $(slibdir) | sed 's,lib\(\|64\)$$,\\\\$$LIB,') diff --git a/debug/tst-lfschk1.c b/debug/tst-chk-0-cc-lfs.cc similarity index 55% rename from debug/tst-lfschk1.c rename to debug/tst-chk-0-cc-lfs.cc index f3e6d47d5e..db699b2391 100644 --- a/debug/tst-lfschk1.c +++ b/debug/tst-chk-0-cc-lfs.cc @@ -1,2 +1,2 @@ #define _FILE_OFFSET_BITS 64 -#include "tst-chk1.c" +#include "tst-chk-0.c" diff --git a/debug/tst-chk-0-cc.cc b/debug/tst-chk-0-cc.cc new file mode 100644 index 0000000000..be76fc69d4 --- /dev/null +++ b/debug/tst-chk-0-cc.cc @@ -0,0 +1 @@ +#include "tst-chk-0.c" diff --git a/debug/tst-lfschk2.c b/debug/tst-chk-0-lfs.c similarity index 55% rename from debug/tst-lfschk2.c rename to debug/tst-chk-0-lfs.c index 95d4db1d32..db699b2391 100644 --- a/debug/tst-lfschk2.c +++ b/debug/tst-chk-0-lfs.c @@ -1,2 +1,2 @@ #define _FILE_OFFSET_BITS 64 -#include "tst-chk2.c" +#include "tst-chk-0.c" diff --git a/debug/tst-chk1.c b/debug/tst-chk-0.c similarity index 100% rename from debug/tst-chk1.c rename to debug/tst-chk-0.c diff --git a/debug/tst-lfschk3.c b/debug/tst-chk-1-cc-lfs.cc similarity index 55% rename from debug/tst-lfschk3.c rename to debug/tst-chk-1-cc-lfs.cc index 50a1ae1258..0d67643e9e 100644 --- a/debug/tst-lfschk3.c +++ b/debug/tst-chk-1-cc-lfs.cc @@ -1,2 +1,2 @@ #define _FILE_OFFSET_BITS 64 -#include "tst-chk3.c" +#include "tst-chk-1.c" diff --git a/debug/tst-chk2.c b/debug/tst-chk-1-cc.cc similarity index 53% rename from debug/tst-chk2.c rename to debug/tst-chk-1-cc.cc index be37ce2d22..945c1f8d5b 100644 --- a/debug/tst-chk2.c +++ b/debug/tst-chk-1-cc.cc @@ -1,2 +1,2 @@ #define _FORTIFY_SOURCE 1 -#include "tst-chk1.c" +#include "tst-chk-0.c" diff --git a/debug/tst-lfschk4.cc b/debug/tst-chk-1-lfs.c similarity index 55% rename from debug/tst-lfschk4.cc rename to debug/tst-chk-1-lfs.c index f3e6d47d5e..0d67643e9e 100644 --- a/debug/tst-lfschk4.cc +++ b/debug/tst-chk-1-lfs.c @@ -1,2 +1,2 @@ #define _FILE_OFFSET_BITS 64 -#include "tst-chk1.c" +#include "tst-chk-1.c" diff --git a/debug/tst-chk5.cc b/debug/tst-chk-1.c similarity index 53% rename from debug/tst-chk5.cc rename to debug/tst-chk-1.c index be37ce2d22..945c1f8d5b 100644 --- a/debug/tst-chk5.cc +++ b/debug/tst-chk-1.c @@ -1,2 +1,2 @@ #define _FORTIFY_SOURCE 1 -#include "tst-chk1.c" +#include "tst-chk-0.c" diff --git a/debug/tst-chk-2-cc-lfs.cc b/debug/tst-chk-2-cc-lfs.cc new file mode 100644 index 0000000000..97c83def5c --- /dev/null +++ b/debug/tst-chk-2-cc-lfs.cc @@ -0,0 +1,2 @@ +#define _FILE_OFFSET_BITS 64 +#include "tst-chk-2.c" diff --git a/debug/tst-chk6.cc b/debug/tst-chk-2-cc.cc similarity index 53% rename from debug/tst-chk6.cc rename to debug/tst-chk-2-cc.cc index 38b8e4fb36..f178340bbd 100644 --- a/debug/tst-chk6.cc +++ b/debug/tst-chk-2-cc.cc @@ -1,2 +1,2 @@ #define _FORTIFY_SOURCE 2 -#include "tst-chk1.c" +#include "tst-chk-0.c" diff --git a/debug/tst-chk-2-lfs.c b/debug/tst-chk-2-lfs.c new file mode 100644 index 0000000000..97c83def5c --- /dev/null +++ b/debug/tst-chk-2-lfs.c @@ -0,0 +1,2 @@ +#define _FILE_OFFSET_BITS 64 +#include "tst-chk-2.c" diff --git a/debug/tst-chk3.c b/debug/tst-chk-2.c similarity index 53% rename from debug/tst-chk3.c rename to debug/tst-chk-2.c index 38b8e4fb36..f178340bbd 100644 --- a/debug/tst-chk3.c +++ b/debug/tst-chk-2.c @@ -1,2 +1,2 @@ #define _FORTIFY_SOURCE 2 -#include "tst-chk1.c" +#include "tst-chk-0.c" diff --git a/debug/tst-chk-3-cc-lfs.cc b/debug/tst-chk-3-cc-lfs.cc new file mode 100644 index 0000000000..d5d8c28bc7 --- /dev/null +++ b/debug/tst-chk-3-cc-lfs.cc @@ -0,0 +1,2 @@ +#define _FILE_OFFSET_BITS 64 +#include "tst-chk-3.c" diff --git a/debug/tst-chk7.c b/debug/tst-chk-3-cc.cc similarity index 53% rename from debug/tst-chk7.c rename to debug/tst-chk-3-cc.cc index 2a7b323812..c1ddac1261 100644 --- a/debug/tst-chk7.c +++ b/debug/tst-chk-3-cc.cc @@ -1,2 +1,2 @@ #define _FORTIFY_SOURCE 3 -#include "tst-chk1.c" +#include "tst-chk-0.c" diff --git a/debug/tst-chk-3-lfs.c b/debug/tst-chk-3-lfs.c new file mode 100644 index 0000000000..d5d8c28bc7 --- /dev/null +++ b/debug/tst-chk-3-lfs.c @@ -0,0 +1,2 @@ +#define _FILE_OFFSET_BITS 64 +#include "tst-chk-3.c" diff --git a/debug/tst-chk8.cc b/debug/tst-chk-3.c similarity index 53% rename from debug/tst-chk8.cc rename to debug/tst-chk-3.c index 2a7b323812..c1ddac1261 100644 --- a/debug/tst-chk8.cc +++ b/debug/tst-chk-3.c @@ -1,2 +1,2 @@ #define _FORTIFY_SOURCE 3 -#include "tst-chk1.c" +#include "tst-chk-0.c" diff --git a/debug/tst-chk4.cc b/debug/tst-chk4.cc deleted file mode 100644 index c82e6aac86..0000000000 --- a/debug/tst-chk4.cc +++ /dev/null @@ -1 +0,0 @@ -#include "tst-chk1.c" diff --git a/debug/tst-lfschk5.cc b/debug/tst-lfschk5.cc deleted file mode 100644 index 95d4db1d32..0000000000 --- a/debug/tst-lfschk5.cc +++ /dev/null @@ -1,2 +0,0 @@ -#define _FILE_OFFSET_BITS 64 -#include "tst-chk2.c" diff --git a/debug/tst-lfschk6.cc b/debug/tst-lfschk6.cc deleted file mode 100644 index 50a1ae1258..0000000000 --- a/debug/tst-lfschk6.cc +++ /dev/null @@ -1,2 +0,0 @@ -#define _FILE_OFFSET_BITS 64 -#include "tst-chk3.c" From patchwork Wed Jan 5 04:45:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 49545 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 95A8B3858422 for ; Wed, 5 Jan 2022 04:47:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 95A8B3858422 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1641358046; bh=R6IkDmBO3eY3hW4XKACWDFht4jjD8i6LUfa5IwDoYpg=; 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=COf8FIbIfLHh7fr0FvD+YJ00BM7p8crxqoTtufm+ln7yt52zzg7qkNmIeEduVHT32 VaMgq6q77T7vh7gX+EbBcAz4kGe2iJclsB6zrwj2iVZTzWmRALai8ufxW1p/Mvr/o4 PGJF5R9nPFM3Wi5UkYZshH4jeAZ55Q+0dhs5fr+8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from black.elm.relay.mailchannels.net (black.elm.relay.mailchannels.net [23.83.212.19]) by sourceware.org (Postfix) with ESMTPS id 23F473858425 for ; Wed, 5 Jan 2022 04:45:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 23F473858425 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 F091A6C1455 for ; Wed, 5 Jan 2022 04:45:39 +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 40C736C1AB9 for ; Wed, 5 Jan 2022 04:45:39 +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.100.11.97 (trex/6.4.3); Wed, 05 Jan 2022 04:45:39 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Thread-Hysterical: 1c880d04145643bc_1641357939810_1611110523 X-MC-Loop-Signature: 1641357939810:3953489169 X-MC-Ingress-Time: 1641357939809 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 4JTH3j42Txz1M4 for ; Tue, 4 Jan 2022 20:45:37 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 2/2] debug: Synchronize feature guards in fortified functions [BZ #28746] Date: Wed, 5 Jan 2022 10:15:16 +0530 Message-Id: <20220105044516.905688-3-siddhesh@sourceware.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220105044516.905688-1-siddhesh@sourceware.org> References: <20220105013946.2646963-1-siddhesh@sourceware.org> <20220105044516.905688-1-siddhesh@sourceware.org> MIME-Version: 1.0 X-Spam-Status: No, score=-3494.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, 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=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: 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" Some functions (e.g. stpcpy, pread64, etc.) had moved to POSIX in the main headers as they got incorporated into the standard, but their fortified variants remained under __USE_GNU. As a result, these functions did not get fortified when _GNU_SOURCE was not defined. Add test wrappers that check all functions tested in tst-chk0 at all levels with _GNU_SOURCE undefined and then use the failures to (1) exclude checks for _GNU_SOURCE functions in these tests and (2) Fix feature macro guards in the fortified function headers so that they're the same as the ones in the main headers. This fixes BZ #28746. Signed-off-by: Siddhesh Poyarekar --- debug/Makefile | 17 +++++++----- debug/tst-chk-0-cc-nongnu.cc | 3 +++ debug/tst-chk-0-nongnu.c | 3 +++ debug/tst-chk-0.c | 49 ++++++++++++++++++++++++++++------ debug/tst-chk-1-cc-nongnu.cc | 3 +++ debug/tst-chk-1-nongnu.c | 3 +++ debug/tst-chk-2-cc-nongnu.cc | 3 +++ debug/tst-chk-2-nongnu.c | 3 +++ debug/tst-chk-3-cc-nongnu.cc | 3 +++ debug/tst-chk-3-nongnu.c | 3 +++ posix/bits/unistd.h | 2 +- string/bits/string_fortified.h | 8 +++--- support/xsignal.h | 2 ++ wcsmbs/bits/wchar2.h | 2 +- 14 files changed, 85 insertions(+), 19 deletions(-) create mode 100644 debug/tst-chk-0-cc-nongnu.cc create mode 100644 debug/tst-chk-0-nongnu.c create mode 100644 debug/tst-chk-1-cc-nongnu.cc create mode 100644 debug/tst-chk-1-nongnu.c create mode 100644 debug/tst-chk-2-cc-nongnu.cc create mode 100644 debug/tst-chk-2-nongnu.c create mode 100644 debug/tst-chk-3-cc-nongnu.cc create mode 100644 debug/tst-chk-3-nongnu.c diff --git a/debug/Makefile b/debug/Makefile index 9aa27eb00c..876d10e521 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -116,6 +116,8 @@ tests-chk = $(addprefix tst-chk-, 0 1 2 3) tests-chk-cc = $(addsuffix -cc, $(tests-chk)) tests-chk-lfs = $(addsuffix -lfs, $(tests-chk)) tests-chk-cc-lfs = $(addsuffix -lfs, $(tests-chk-cc)) +tests-chk-nongnu = $(addsuffix -nongnu, $(tests-chk)) +tests-chk-cc-nongnu = $(addsuffix -nongnu, $(tests-chk-cc)) # We know these tests have problems with format strings, this is what # we are testing. Disable that warning. They are also testing @@ -126,16 +128,17 @@ define disable-warnings CFLAGS-$(1).$(2) += -Wno-format -Wno-deprecated-declarations -Wno-error endef -$(foreach t,$(tests-chk) $(tests-chk-lfs), \ +$(foreach t,$(tests-chk) $(tests-chk-lfs) $(tests-chk-nongnu), \ $(eval $(call disable-warnings,$(t),c))) -$(foreach t,$(tests-chk-cc) $(tests-chk-cc-lfs), \ +$(foreach t,$(tests-chk-cc) $(tests-chk-cc-lfs) $(tests-chk-cc-nongnu), \ $(eval $(call disable-warnings,$(t),cc))) define link-cc LDLIBS-$(1) = -lstdc++ endef -$(foreach t,$(tests-chk-cc) $(tests-chk-cc-lfs), $(eval $(call link-cc,$(t)))) +$(foreach t,$(tests-chk-cc) $(tests-chk-cc-lfs) $(tests-chk-cc-nongnu), \ + $(eval $(call link-cc,$(t)))) # backtrace_symbols only works if we link with -rdynamic. backtrace # requires unwind tables on most architectures. @@ -156,14 +159,15 @@ tests = backtrace-tst tst-longjmp_chk \ test-strcpy_chk test-stpcpy_chk \ tst-longjmp_chk2 tst-backtrace2 tst-backtrace3 \ tst-backtrace4 tst-backtrace5 tst-backtrace6 tst-realpath-chk \ - $(tests-chk) $(tests-chk-cc) $(tests-chk-lfs) $(tests-chk-cc-lfs) + $(tests-chk) $(tests-chk-cc) $(tests-chk-lfs) $(tests-chk-cc-lfs) \ + $(tests-chk-nongnu) $(tests-chk-cc-nongnu) ifeq ($(have-ssp),yes) tests += tst-ssp-1 endif ifeq (,$(CXX)) -tests-unsupported = $(tests-chk-cc) $(tests-chk-cc-lfs) +tests-unsupported = $(tests-chk-cc) $(tests-chk-cc-lfs) $(tests-chk-cc-nongnu) endif extra-libs = libSegFault libpcprofile @@ -194,7 +198,8 @@ define chk-gen-locales $(objpfx)$(1).out: $(gen-locales) endef $(foreach t, \ - $(tests-chk) $(tests-chk-cc) $(tests-chk-lfs) $(tests-chk-cc-lfs), \ + $(tests-chk) $(tests-chk-cc) $(tests-chk-lfs) $(tests-chk-cc-lfs) \ + $(tests-chk-nongnu) $(tests-chk-cc-nongnu), \ $(eval $(call link-cc,$(t)))) endif diff --git a/debug/tst-chk-0-cc-nongnu.cc b/debug/tst-chk-0-cc-nongnu.cc new file mode 100644 index 0000000000..24b1306e16 --- /dev/null +++ b/debug/tst-chk-0-cc-nongnu.cc @@ -0,0 +1,3 @@ +#undef _GNU_SOURCE +#define _LARGEFILE64_SOURCE 1 +#include "tst-chk-0.c" diff --git a/debug/tst-chk-0-nongnu.c b/debug/tst-chk-0-nongnu.c new file mode 100644 index 0000000000..24b1306e16 --- /dev/null +++ b/debug/tst-chk-0-nongnu.c @@ -0,0 +1,3 @@ +#undef _GNU_SOURCE +#define _LARGEFILE64_SOURCE 1 +#include "tst-chk-0.c" diff --git a/debug/tst-chk-0.c b/debug/tst-chk-0.c index 9288610fe6..d65a2fe6e1 100644 --- a/debug/tst-chk-0.c +++ b/debug/tst-chk-0.c @@ -1,4 +1,5 @@ /* Copyright (C) 2004-2022 Free Software Foundation, Inc. + Copyright The GNU Toolchain Authors. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -36,6 +37,17 @@ #include #include +#ifndef _GNU_SOURCE +# define MEMPCPY memcpy +# define WMEMPCPY wmemcpy +# define MEMPCPY_RET(x) 0 +# define WMEMPCPY_RET(x) 0 +#else +# define MEMPCPY mempcpy +# define WMEMPCPY wmempcpy +# define MEMPCPY_RET(x) __builtin_strlen (x) +# define WMEMPCPY_RET(x) wcslen (x) +#endif #define obstack_chunk_alloc malloc #define obstack_chunk_free free @@ -162,7 +174,7 @@ do_test (void) if (memcmp (buf, "aabcdefghi", 10)) FAIL (); - if (mempcpy (buf + 5, "abcde", 5) != buf + 10 + if (MEMPCPY (buf + 5, "abcde", 5) != buf + 5 + MEMPCPY_RET ("abcde") || memcmp (buf, "aabcdabcde", 10)) FAIL (); @@ -207,7 +219,7 @@ do_test (void) if (memcmp (buf, "aabcdefghi", 10)) FAIL (); - if (mempcpy (buf + 5, "abcde", l0 + 5) != buf + 10 + if (MEMPCPY (buf + 5, "abcde", l0 + 5) != buf + 5 + MEMPCPY_RET ("abcde") || memcmp (buf, "aabcdabcde", 10)) FAIL (); @@ -266,7 +278,8 @@ do_test (void) if (memcmp (a.buf1, "aabcdefghi", 10)) FAIL (); - if (mempcpy (a.buf1 + 5, "abcde", l0 + 5) != a.buf1 + 10 + if (MEMPCPY (a.buf1 + 5, "abcde", l0 + 5) + != a.buf1 + 5 + MEMPCPY_RET ("abcde") || memcmp (a.buf1, "aabcdabcde", 10)) FAIL (); @@ -347,6 +360,7 @@ do_test (void) bcopy (buf + 1, buf + 2, l0 + 9); CHK_FAIL_END +#ifdef _GNU_SOURCE CHK_FAIL_START p = (char *) mempcpy (buf + 6, "abcde", 5); CHK_FAIL_END @@ -354,6 +368,7 @@ do_test (void) CHK_FAIL_START p = (char *) mempcpy (buf + 6, "abcde", l0 + 5); CHK_FAIL_END +#endif CHK_FAIL_START memset (buf + 9, 'j', 2); @@ -464,6 +479,7 @@ do_test (void) bcopy (a.buf1 + 1, a.buf1 + 2, l0 + 9); CHK_FAIL_END +#ifdef _GNU_SOURCE CHK_FAIL_START p = (char *) mempcpy (a.buf1 + 6, "abcde", 5); CHK_FAIL_END @@ -471,6 +487,7 @@ do_test (void) CHK_FAIL_START p = (char *) mempcpy (a.buf1 + 6, "abcde", l0 + 5); CHK_FAIL_END +#endif CHK_FAIL_START memset (a.buf1 + 9, 'j', 2); @@ -550,7 +567,7 @@ do_test (void) if (wmemcmp (wbuf, L"aabcdefghi", 10)) FAIL (); - if (wmempcpy (wbuf + 5, L"abcde", 5) != wbuf + 10 + if (WMEMPCPY (wbuf + 5, L"abcde", 5) != wbuf + 5 + WMEMPCPY_RET (L"abcde") || wmemcmp (wbuf, L"aabcdabcde", 10)) FAIL (); @@ -583,7 +600,8 @@ do_test (void) if (wmemcmp (wbuf, L"aabcdefghi", 10)) FAIL (); - if (wmempcpy (wbuf + 5, L"abcde", l0 + 5) != wbuf + 10 + if (WMEMPCPY (wbuf + 5, L"abcde", l0 + 5) + != wbuf + 5 + WMEMPCPY_RET (L"abcde") || wmemcmp (wbuf, L"aabcdabcde", 10)) FAIL (); @@ -625,7 +643,8 @@ do_test (void) if (wmemcmp (wa.buf1, L"aabcdefghi", 10)) FAIL (); - if (wmempcpy (wa.buf1 + 5, L"abcde", l0 + 5) != wa.buf1 + 10 + if (WMEMPCPY (wa.buf1 + 5, L"abcde", l0 + 5) + != wa.buf1 + 5 + WMEMPCPY_RET (L"abcde") || wmemcmp (wa.buf1, L"aabcdabcde", 10)) FAIL (); @@ -694,6 +713,7 @@ do_test (void) wmemmove (wbuf + 2, wbuf + 1, l0 + 9); CHK_FAIL_END +#ifdef _GNU_SOURCE CHK_FAIL_START wp = wmempcpy (wbuf + 6, L"abcde", 5); CHK_FAIL_END @@ -701,6 +721,7 @@ do_test (void) CHK_FAIL_START wp = wmempcpy (wbuf + 6, L"abcde", l0 + 5); CHK_FAIL_END +#endif CHK_FAIL_START wmemset (wbuf + 9, L'j', 2); @@ -768,6 +789,7 @@ do_test (void) wmemmove (wa.buf1 + 2, wa.buf1 + 1, l0 + 9); CHK_FAIL_END +#ifdef _GNU_SOURCE CHK_FAIL_START wp = wmempcpy (wa.buf1 + 6, L"abcde", 5); CHK_FAIL_END @@ -775,6 +797,7 @@ do_test (void) CHK_FAIL_START wp = wmempcpy (wa.buf1 + 6, L"abcde", l0 + 5); CHK_FAIL_END +#endif CHK_FAIL_START wmemset (wa.buf1 + 9, L'j', 2); @@ -906,6 +929,7 @@ do_test (void) if (fprintf (fp, buf2 + 4, str5) != 7) FAIL (); +#ifdef _GNU_SOURCE char *my_ptr = NULL; strcpy (buf2 + 2, "%n%s%n"); /* When the format string is writable and contains %n, @@ -935,6 +959,7 @@ do_test (void) if (obstack_printf (&obs, "%s%n%s%n", str4, &n1, str5, &n1) != 14) FAIL (); obstack_free (&obs, NULL); +#endif if (freopen (temp_filename, "r", stdin) == NULL) { @@ -982,6 +1007,7 @@ do_test (void) rewind (stdin); +#ifdef _GNU_SOURCE if (fgets_unlocked (buf, buf_size, stdin) != buf || memcmp (buf, "abcdefgh\n", 10)) FAIL (); @@ -1008,6 +1034,7 @@ do_test (void) #endif rewind (stdin); +#endif if (fread (buf, 1, buf_size, stdin) != buf_size || memcmp (buf, "abcdefgh\nA", 10)) @@ -1578,7 +1605,10 @@ do_test (void) ret = 1; } - int fd = posix_openpt (O_RDWR); + int fd; + +#ifdef _GNU_SOURCE + fd = posix_openpt (O_RDWR); if (fd != -1) { char enough[1000]; @@ -1594,6 +1624,7 @@ do_test (void) #endif close (fd); } +#endif #if PATH_MAX > 0 confstr (_CS_GNU_LIBC_VERSION, largebuf, sizeof (largebuf)); @@ -1711,8 +1742,9 @@ do_test (void) poll (fds, l0 + 2, 0); CHK_FAIL_END #endif +#ifdef _GNU_SOURCE ppoll (fds, 1, NULL, NULL); -#if __USE_FORTIFY_LEVEL >= 1 +# if __USE_FORTIFY_LEVEL >= 1 CHK_FAIL_START ppoll (fds, 2, NULL, NULL); CHK_FAIL_END @@ -1720,6 +1752,7 @@ do_test (void) CHK_FAIL_START ppoll (fds, l0 + 2, NULL, NULL); CHK_FAIL_END +# endif #endif return ret; diff --git a/debug/tst-chk-1-cc-nongnu.cc b/debug/tst-chk-1-cc-nongnu.cc new file mode 100644 index 0000000000..cce36ff617 --- /dev/null +++ b/debug/tst-chk-1-cc-nongnu.cc @@ -0,0 +1,3 @@ +#undef _GNU_SOURCE +#define _LARGEFILE64_SOURCE 1 +#include "tst-chk-1.c" diff --git a/debug/tst-chk-1-nongnu.c b/debug/tst-chk-1-nongnu.c new file mode 100644 index 0000000000..cce36ff617 --- /dev/null +++ b/debug/tst-chk-1-nongnu.c @@ -0,0 +1,3 @@ +#undef _GNU_SOURCE +#define _LARGEFILE64_SOURCE 1 +#include "tst-chk-1.c" diff --git a/debug/tst-chk-2-cc-nongnu.cc b/debug/tst-chk-2-cc-nongnu.cc new file mode 100644 index 0000000000..149af283c4 --- /dev/null +++ b/debug/tst-chk-2-cc-nongnu.cc @@ -0,0 +1,3 @@ +#undef _GNU_SOURCE +#define _LARGEFILE64_SOURCE 1 +#include "tst-chk-2.c" diff --git a/debug/tst-chk-2-nongnu.c b/debug/tst-chk-2-nongnu.c new file mode 100644 index 0000000000..149af283c4 --- /dev/null +++ b/debug/tst-chk-2-nongnu.c @@ -0,0 +1,3 @@ +#undef _GNU_SOURCE +#define _LARGEFILE64_SOURCE 1 +#include "tst-chk-2.c" diff --git a/debug/tst-chk-3-cc-nongnu.cc b/debug/tst-chk-3-cc-nongnu.cc new file mode 100644 index 0000000000..a306b3290c --- /dev/null +++ b/debug/tst-chk-3-cc-nongnu.cc @@ -0,0 +1,3 @@ +#undef _GNU_SOURCE +#define _LARGEFILE64_SOURCE 1 +#include "tst-chk-3.c" diff --git a/debug/tst-chk-3-nongnu.c b/debug/tst-chk-3-nongnu.c new file mode 100644 index 0000000000..a306b3290c --- /dev/null +++ b/debug/tst-chk-3-nongnu.c @@ -0,0 +1,3 @@ +#undef _GNU_SOURCE +#define _LARGEFILE64_SOURCE 1 +#include "tst-chk-3.c" diff --git a/posix/bits/unistd.h b/posix/bits/unistd.h index 01df84b5f9..f53a7a06eb 100644 --- a/posix/bits/unistd.h +++ b/posix/bits/unistd.h @@ -40,7 +40,7 @@ read (int __fd, void *__buf, size_t __nbytes) __fd, __buf, __nbytes); } -#ifdef __USE_UNIX98 +#if defined __USE_UNIX98 || defined __USE_XOPEN2K8 extern ssize_t __pread_chk (int __fd, void *__buf, size_t __nbytes, __off_t __offset, size_t __bufsize) __wur __attr_access ((__write_only__, 2, 3)); diff --git a/string/bits/string_fortified.h b/string/bits/string_fortified.h index 51ad480401..d0188b5ba8 100644 --- a/string/bits/string_fortified.h +++ b/string/bits/string_fortified.h @@ -79,7 +79,7 @@ __NTH (strcpy (char *__restrict __dest, const char *__restrict __src)) return __builtin___strcpy_chk (__dest, __src, __glibc_objsize (__dest)); } -#ifdef __USE_GNU +#ifdef __USE_XOPEN2K8 __fortify_function char * __NTH (stpcpy (char *__restrict __dest, const char *__restrict __src)) { @@ -96,14 +96,15 @@ __NTH (strncpy (char *__restrict __dest, const char *__restrict __src, __glibc_objsize (__dest)); } -#if __GNUC_PREREQ (4, 7) || __glibc_clang_prereq (2, 6) +#if __USE_XOPEN2K8 +# if __GNUC_PREREQ (4, 7) || __glibc_clang_prereq (2, 6) __fortify_function char * __NTH (stpncpy (char *__dest, const char *__src, size_t __n)) { return __builtin___stpncpy_chk (__dest, __src, __n, __glibc_objsize (__dest)); } -#else +# else extern char *__stpncpy_chk (char *__dest, const char *__src, size_t __n, size_t __destlen) __THROW __fortified_attr_access ((__write_only__, 1, 3)) @@ -119,6 +120,7 @@ __NTH (stpncpy (char *__dest, const char *__src, size_t __n)) return __stpncpy_chk (__dest, __src, __n, __bos (__dest)); return __stpncpy_alias (__dest, __src, __n); } +# endif #endif diff --git a/support/xsignal.h b/support/xsignal.h index 973f532495..d868bb336c 100644 --- a/support/xsignal.h +++ b/support/xsignal.h @@ -28,7 +28,9 @@ __BEGIN_DECLS terminate the process on error. */ void xraise (int sig); +#ifdef _GNU_SOURCE sighandler_t xsignal (int sig, sighandler_t handler); +#endif void xsigaction (int sig, const struct sigaction *newact, struct sigaction *oldact); diff --git a/wcsmbs/bits/wchar2.h b/wcsmbs/bits/wchar2.h index 25d06d433f..0e017f458b 100644 --- a/wcsmbs/bits/wchar2.h +++ b/wcsmbs/bits/wchar2.h @@ -457,7 +457,7 @@ __NTH (wcsrtombs (char *__restrict __dst, const wchar_t **__restrict __src, } -#ifdef __USE_GNU +#ifdef __USE_XOPEN2K8 extern size_t __mbsnrtowcs_chk (wchar_t *__restrict __dst, const char **__restrict __src, size_t __nmc, size_t __len, mbstate_t *__restrict __ps,