From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bee.birch.relay.mailchannels.net (bee.birch.relay.mailchannels.net [23.83.209.14]) by sourceware.org (Postfix) with ESMTPS id 4B48E385781D for ; Fri, 11 Mar 2022 15:20:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4B48E385781D 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 EB7038228D0; Fri, 11 Mar 2022 15:12:55 +0000 (UTC) Received: from pdx1-sub0-mail-a304.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id A70ED822298; Fri, 11 Mar 2022 15:12:24 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1647011575; a=rsa-sha256; cv=none; b=NU4LrYrKUt6bdodwk1GkYBUMOzUxJ9PwP3vFGeMjIdQgfOzXEu1Xn+D1ml4oDrojg8rr2N GdDfLZEuunt8DEtUEaW16X15LfIBnsF7wt3qFkeTzeMFaYCHaLb4Hx8WMssAIKTHefnoEK dV5L7SyfJ9ZKjizVP1YFExAlI8HdMb02ji1T328WtvUnK6GXiZDYo4zAHSg9MPAK/7ls5t nb3XUrBlIYKvtybVM4/s8KM6FBhbjFpuFmb6nHGs4DuiEFE1+YFxVEVEHZncpCOyPZKSPL J13EEeRCULyev3ipaIQwvs63Qz76idWsCifAJlgiU/BdLPoOCICSm0RV44KfRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1647011575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nmW88iKcVZ3E7IlGEuNupRfCrSr1/j5QdhyALW41oXU=; b=Qu7ioZ9XV9pGmxAVKkzYLKmDxO0F4cZBi6yG24jP6L6pGAtAuCWYKFAZYwTJvoExHHOR4n XOXyJrZ6P01btby/E9QJoIIOzhwv6WAmrg0TAVa4pSeUPjGWTk85JRRFR7kmGnZ9Yy1wQN TqgCYOZO3t2+JQH66hMaZM0dMiNHeIJmD2zp+8+JAu8bGhXC/XS69YC7LjdB7qKpnUw8Ie V6YHW2+7oJKmolXaBpN7zAUUGy1JrZ3w9Ni6HA68UK0im20epI7llHHWWWHUGYq0o/OMfm 1dFc/Vx0fwLeYVboAWvT0AWHkWKzOCz2iwvxBroqOEUuftcyIoRN9a5UXCEX+g== ARC-Authentication-Results: i=1; rspamd-c9cb649d9-v7bqc; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a304.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.102.3.5 (trex/6.5.3); Fri, 11 Mar 2022 15:12:55 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Society-Suffer: 0e811bcd4f2ef410_1647011575813_694933709 X-MC-Loop-Signature: 1647011575813:2382622194 X-MC-Ingress-Time: 1647011575812 Received: from rhbox.redhat.com (unknown [1.186.122.132]) (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-a304.dreamhost.com (Postfix) with ESMTPSA id 4KFTtt0JwGz18c; Fri, 11 Mar 2022 07:12:21 -0800 (PST) From: Siddhesh Poyarekar To: libc-stable@sourceware.org Cc: carlos@redhat.com, fweimer@redhat.com, Adhemerval Zanella Subject: [committed 2.34 3/8] debug: Add tests for _FORTIFY_SOURCE=3 Date: Fri, 11 Mar 2022 20:41:58 +0530 Message-Id: <20220311151203.3585163-4-siddhesh@sourceware.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220311151203.3585163-1-siddhesh@sourceware.org> References: <20220311151203.3585163-1-siddhesh@sourceware.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3494.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_NUMSUBJECT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL, SPF_HELO_NONE, SPF_NEUTRAL, TXREP, T_SCC_BODY_TEXT_LINE 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-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2022 15:20:48 -0000 Add some testing coverage for _FORTIFY_SOURCE=3. Signed-off-by: Siddhesh Poyarekar Reviewed-by: Adhemerval Zanella (cherry picked from commit ad6f2a010c2ce759936de4747f6e0d53991912f8) --- debug/Makefile | 13 ++++-- debug/tst-chk1.c | 102 +++++++++++++++++++++++++--------------------- debug/tst-chk7.c | 2 + debug/tst-chk8.cc | 2 + 4 files changed, 69 insertions(+), 50 deletions(-) create mode 100644 debug/tst-chk7.c create mode 100644 debug/tst-chk8.cc diff --git a/debug/Makefile b/debug/Makefile index 6893111cbf..357f888246 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -120,6 +120,8 @@ 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 @@ -129,6 +131,7 @@ 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++ @@ -150,16 +153,16 @@ 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-lfschk4 tst-lfschk5 tst-lfschk6 \ - tst-longjmp_chk2 tst-backtrace2 tst-backtrace3 tst-backtrace4 \ - tst-backtrace5 tst-backtrace6 + 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 ifeq ($(have-ssp),yes) tests += tst-ssp-1 endif ifeq (,$(CXX)) -tests-unsupported = tst-chk4 tst-chk5 tst-chk6 \ +tests-unsupported = tst-chk4 tst-chk5 tst-chk6 tst-chk8 \ tst-lfschk4 tst-lfschk5 tst-lfschk6 endif @@ -193,6 +196,8 @@ $(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) diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c index 6c1d32cc62..68ac00d180 100644 --- a/debug/tst-chk1.c +++ b/debug/tst-chk1.c @@ -83,8 +83,14 @@ handler (int sig) _exit (127); } +#if __USE_FORTIFY_LEVEL == 3 +volatile size_t buf_size = 10; +#else char buf[10]; wchar_t wbuf[10]; +#define buf_size sizeof (buf) +#endif + volatile size_t l0; volatile char *p; volatile wchar_t *wp; @@ -123,6 +129,10 @@ int num2 = 987654; static int do_test (void) { +#if __USE_FORTIFY_LEVEL == 3 + char *buf = (char *) malloc (buf_size); + wchar_t *wbuf = (wchar_t *) malloc (buf_size * sizeof (wchar_t)); +#endif set_fortify_handler (handler); struct A { char buf1[9]; char buf2[1]; } a; @@ -947,93 +957,93 @@ do_test (void) rewind (stdin); - if (fgets (buf, sizeof (buf), stdin) != buf + if (fgets (buf, buf_size, stdin) != buf || memcmp (buf, "abcdefgh\n", 10)) FAIL (); - if (fgets (buf, sizeof (buf), stdin) != buf || memcmp (buf, "ABCDEFGHI", 10)) + if (fgets (buf, buf_size, stdin) != buf || memcmp (buf, "ABCDEFGHI", 10)) FAIL (); rewind (stdin); - if (fgets (buf, l0 + sizeof (buf), stdin) != buf + if (fgets (buf, l0 + buf_size, stdin) != buf || memcmp (buf, "abcdefgh\n", 10)) FAIL (); #if __USE_FORTIFY_LEVEL >= 1 CHK_FAIL_START - if (fgets (buf, sizeof (buf) + 1, stdin) != buf) + if (fgets (buf, buf_size + 1, stdin) != buf) FAIL (); CHK_FAIL_END CHK_FAIL_START - if (fgets (buf, l0 + sizeof (buf) + 1, stdin) != buf) + if (fgets (buf, l0 + buf_size + 1, stdin) != buf) FAIL (); CHK_FAIL_END #endif rewind (stdin); - if (fgets_unlocked (buf, sizeof (buf), stdin) != buf + if (fgets_unlocked (buf, buf_size, stdin) != buf || memcmp (buf, "abcdefgh\n", 10)) FAIL (); - if (fgets_unlocked (buf, sizeof (buf), stdin) != buf + if (fgets_unlocked (buf, buf_size, stdin) != buf || memcmp (buf, "ABCDEFGHI", 10)) FAIL (); rewind (stdin); - if (fgets_unlocked (buf, l0 + sizeof (buf), stdin) != buf + if (fgets_unlocked (buf, l0 + buf_size, stdin) != buf || memcmp (buf, "abcdefgh\n", 10)) FAIL (); #if __USE_FORTIFY_LEVEL >= 1 CHK_FAIL_START - if (fgets_unlocked (buf, sizeof (buf) + 1, stdin) != buf) + if (fgets_unlocked (buf, buf_size + 1, stdin) != buf) FAIL (); CHK_FAIL_END CHK_FAIL_START - if (fgets_unlocked (buf, l0 + sizeof (buf) + 1, stdin) != buf) + if (fgets_unlocked (buf, l0 + buf_size + 1, stdin) != buf) FAIL (); CHK_FAIL_END #endif rewind (stdin); - if (fread (buf, 1, sizeof (buf), stdin) != sizeof (buf) + if (fread (buf, 1, buf_size, stdin) != buf_size || memcmp (buf, "abcdefgh\nA", 10)) FAIL (); - if (fread (buf, sizeof (buf), 1, stdin) != 1 + if (fread (buf, buf_size, 1, stdin) != 1 || memcmp (buf, "BCDEFGHI\na", 10)) FAIL (); rewind (stdin); - if (fread (buf, l0 + 1, sizeof (buf), stdin) != sizeof (buf) + if (fread (buf, l0 + 1, buf_size, stdin) != buf_size || memcmp (buf, "abcdefgh\nA", 10)) FAIL (); - if (fread (buf, sizeof (buf), l0 + 1, stdin) != 1 + if (fread (buf, buf_size, l0 + 1, stdin) != 1 || memcmp (buf, "BCDEFGHI\na", 10)) FAIL (); #if __USE_FORTIFY_LEVEL >= 1 CHK_FAIL_START - if (fread (buf, 1, sizeof (buf) + 1, stdin) != sizeof (buf) + 1) + if (fread (buf, 1, buf_size + 1, stdin) != buf_size + 1) FAIL (); CHK_FAIL_END CHK_FAIL_START - if (fread (buf, sizeof (buf) + 1, l0 + 1, stdin) != 1) + if (fread (buf, buf_size + 1, l0 + 1, stdin) != 1) FAIL (); CHK_FAIL_END #endif rewind (stdin); - if (fread_unlocked (buf, 1, sizeof (buf), stdin) != sizeof (buf) + if (fread_unlocked (buf, 1, buf_size, stdin) != buf_size || memcmp (buf, "abcdefgh\nA", 10)) FAIL (); - if (fread_unlocked (buf, sizeof (buf), 1, stdin) != 1 + if (fread_unlocked (buf, buf_size, 1, stdin) != 1 || memcmp (buf, "BCDEFGHI\na", 10)) FAIL (); @@ -1048,100 +1058,100 @@ do_test (void) rewind (stdin); - if (fread_unlocked (buf, l0 + 1, sizeof (buf), stdin) != sizeof (buf) + if (fread_unlocked (buf, l0 + 1, buf_size, stdin) != buf_size || memcmp (buf, "abcdefgh\nA", 10)) FAIL (); - if (fread_unlocked (buf, sizeof (buf), l0 + 1, stdin) != 1 + if (fread_unlocked (buf, buf_size, l0 + 1, stdin) != 1 || memcmp (buf, "BCDEFGHI\na", 10)) FAIL (); #if __USE_FORTIFY_LEVEL >= 1 CHK_FAIL_START - if (fread_unlocked (buf, 1, sizeof (buf) + 1, stdin) != sizeof (buf) + 1) + if (fread_unlocked (buf, 1, buf_size + 1, stdin) != buf_size + 1) FAIL (); CHK_FAIL_END CHK_FAIL_START - if (fread_unlocked (buf, sizeof (buf) + 1, l0 + 1, stdin) != 1) + if (fread_unlocked (buf, buf_size + 1, l0 + 1, stdin) != 1) FAIL (); CHK_FAIL_END #endif lseek (fileno (stdin), 0, SEEK_SET); - if (read (fileno (stdin), buf, sizeof (buf) - 1) != sizeof (buf) - 1 + if (read (fileno (stdin), buf, buf_size - 1) != buf_size - 1 || memcmp (buf, "abcdefgh\n", 9)) FAIL (); - if (read (fileno (stdin), buf, sizeof (buf) - 1) != sizeof (buf) - 1 + if (read (fileno (stdin), buf, buf_size - 1) != buf_size - 1 || memcmp (buf, "ABCDEFGHI", 9)) FAIL (); lseek (fileno (stdin), 0, SEEK_SET); - if (read (fileno (stdin), buf, l0 + sizeof (buf) - 1) != sizeof (buf) - 1 + if (read (fileno (stdin), buf, l0 + buf_size - 1) != buf_size - 1 || memcmp (buf, "abcdefgh\n", 9)) FAIL (); #if __USE_FORTIFY_LEVEL >= 1 CHK_FAIL_START - if (read (fileno (stdin), buf, sizeof (buf) + 1) != sizeof (buf) + 1) + if (read (fileno (stdin), buf, buf_size + 1) != buf_size + 1) FAIL (); CHK_FAIL_END CHK_FAIL_START - if (read (fileno (stdin), buf, l0 + sizeof (buf) + 1) != sizeof (buf) + 1) + if (read (fileno (stdin), buf, l0 + buf_size + 1) != buf_size + 1) FAIL (); CHK_FAIL_END #endif - if (pread (fileno (stdin), buf, sizeof (buf) - 1, sizeof (buf) - 2) - != sizeof (buf) - 1 + if (pread (fileno (stdin), buf, buf_size - 1, buf_size - 2) + != buf_size - 1 || memcmp (buf, "\nABCDEFGH", 9)) FAIL (); - if (pread (fileno (stdin), buf, sizeof (buf) - 1, 0) != sizeof (buf) - 1 + if (pread (fileno (stdin), buf, buf_size - 1, 0) != buf_size - 1 || memcmp (buf, "abcdefgh\n", 9)) FAIL (); - if (pread (fileno (stdin), buf, l0 + sizeof (buf) - 1, sizeof (buf) - 3) - != sizeof (buf) - 1 + if (pread (fileno (stdin), buf, l0 + buf_size - 1, buf_size - 3) + != buf_size - 1 || memcmp (buf, "h\nABCDEFG", 9)) FAIL (); #if __USE_FORTIFY_LEVEL >= 1 CHK_FAIL_START - if (pread (fileno (stdin), buf, sizeof (buf) + 1, 2 * sizeof (buf)) - != sizeof (buf) + 1) + if (pread (fileno (stdin), buf, buf_size + 1, 2 * buf_size) + != buf_size + 1) FAIL (); CHK_FAIL_END CHK_FAIL_START - if (pread (fileno (stdin), buf, l0 + sizeof (buf) + 1, 2 * sizeof (buf)) - != sizeof (buf) + 1) + if (pread (fileno (stdin), buf, l0 + buf_size + 1, 2 * buf_size) + != buf_size + 1) FAIL (); CHK_FAIL_END #endif - if (pread64 (fileno (stdin), buf, sizeof (buf) - 1, sizeof (buf) - 2) - != sizeof (buf) - 1 + if (pread64 (fileno (stdin), buf, buf_size - 1, buf_size - 2) + != buf_size - 1 || memcmp (buf, "\nABCDEFGH", 9)) FAIL (); - if (pread64 (fileno (stdin), buf, sizeof (buf) - 1, 0) != sizeof (buf) - 1 + if (pread64 (fileno (stdin), buf, buf_size - 1, 0) != buf_size - 1 || memcmp (buf, "abcdefgh\n", 9)) FAIL (); - if (pread64 (fileno (stdin), buf, l0 + sizeof (buf) - 1, sizeof (buf) - 3) - != sizeof (buf) - 1 + if (pread64 (fileno (stdin), buf, l0 + buf_size - 1, buf_size - 3) + != buf_size - 1 || memcmp (buf, "h\nABCDEFG", 9)) FAIL (); #if __USE_FORTIFY_LEVEL >= 1 CHK_FAIL_START - if (pread64 (fileno (stdin), buf, sizeof (buf) + 1, 2 * sizeof (buf)) - != sizeof (buf) + 1) + if (pread64 (fileno (stdin), buf, buf_size + 1, 2 * buf_size) + != buf_size + 1) FAIL (); CHK_FAIL_END CHK_FAIL_START - if (pread64 (fileno (stdin), buf, l0 + sizeof (buf) + 1, 2 * sizeof (buf)) - != sizeof (buf) + 1) + if (pread64 (fileno (stdin), buf, l0 + buf_size + 1, 2 * buf_size) + != buf_size + 1) FAIL (); CHK_FAIL_END #endif @@ -1179,7 +1189,7 @@ do_test (void) CHK_FAIL2_END CHK_FAIL2_START - snprintf (buf, sizeof (buf), "%3$d\n", 1, 2, 3, 4); + snprintf (buf, buf_size, "%3$d\n", 1, 2, 3, 4); CHK_FAIL2_END int sp[2]; diff --git a/debug/tst-chk7.c b/debug/tst-chk7.c new file mode 100644 index 0000000000..2a7b323812 --- /dev/null +++ b/debug/tst-chk7.c @@ -0,0 +1,2 @@ +#define _FORTIFY_SOURCE 3 +#include "tst-chk1.c" diff --git a/debug/tst-chk8.cc b/debug/tst-chk8.cc new file mode 100644 index 0000000000..2a7b323812 --- /dev/null +++ b/debug/tst-chk8.cc @@ -0,0 +1,2 @@ +#define _FORTIFY_SOURCE 3 +#include "tst-chk1.c" -- 2.35.1