From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dragonfly.birch.relay.mailchannels.net (dragonfly.birch.relay.mailchannels.net [23.83.209.51]) by sourceware.org (Postfix) with ESMTPS id 09FB33858037 for ; Fri, 11 Mar 2022 15:13:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 09FB33858037 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 0574E6C24D4; Fri, 11 Mar 2022 15:13:21 +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 176EA6C1BEB; Fri, 11 Mar 2022 15:12:52 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1647011598; a=rsa-sha256; cv=none; b=jDSLduimLPGevWqhpd01dzfTk3/iExM6I9O8qZFWkOsR40BGRxoL+vlxd2ooziIlM4RQD1 I8hcvdDce3i01ZUHNBhsnOzj7/RunHjIKciWXfqtrQ6QG30UkRVdjdXft7cUR9rHXAISop 2Eu+EoVZ425FN3jUoMUSplyo71H8y/DKSHlPUFCFAsV3pi/LvlgDHl9AnEDFYH1EtoSWfZ loywLSHZKY6Y43Q2oeHiQP5XSbZ2ZRVHUPH+rSVENdr1M3WcOYrfOqKEVwffAPrC06sZNH LlzC9zgN+Vr/BnZUCJ4FXNJjvwIQ9wEZiW6hbQiofeee/qExZbefHCIni5h8/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1647011598; 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=ONqJWWTFYnp88phSnWlRzsZ14VZemtyxVgKNxF/XvzU=; b=AUeqTGFyCTk/TR7kdzcrjAiC/9fAQaYt2MaxYMJeiFO6lEWQzEV7uGD7dAo4a+16XckXkN Ina7zHq0NPFWnz2PWvelqoVJ1zzjiFk8MjotS7F3a5cH+pmapUedHW0egvDd8oUYGsTR5w MBemPO0E9l5aQopoM9rO2vM7PFDuEJKKNxwQqbJL8McFRHv8hPBt/GSUwg83VF2EAu9iUi JtOngCl4Tyc2lNfOuAG62VyuDwkVgrHtoIBA5BciORe1OJjRzej91bZgBMppRqVeBMovgk khlKIjZ3S5qRxg6HHBeBKu5cFuZIACUn7Cx67K8orSp1dqUCNZw0K9kXpe+Omg== 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.109.126.197 (trex/6.5.3); Fri, 11 Mar 2022 15:13:21 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Bottle-Hysterical: 442272ce56f0b36f_1647011600453_3672984558 X-MC-Loop-Signature: 1647011600453:3705453240 X-MC-Ingress-Time: 1647011600452 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 4KFTv02nKRz1NC; Fri, 11 Mar 2022 07:12:27 -0800 (PST) From: Siddhesh Poyarekar To: libc-stable@sourceware.org Cc: carlos@redhat.com, fweimer@redhat.com, Adhemerval Zanella Subject: [committed 2.34 5/8] fortify: Fix spurious warning with realpath Date: Fri, 11 Mar 2022 20:42:00 +0530 Message-Id: <20220311151203.3585163-6-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.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, 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:13:28 -0000 The length and object size arguments were swapped around for realpath. Also add a smoke test so that any changes in this area get caught in future. Signed-off-by: Siddhesh Poyarekar Reviewed-by: Adhemerval Zanella (cherry picked from commit 2bbd07c715275eb6c616988925738a0517180d57) --- debug/Makefile | 3 ++- debug/tst-realpath-chk.c | 37 +++++++++++++++++++++++++++++++++++++ stdlib/bits/stdlib.h | 2 +- 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 debug/tst-realpath-chk.c diff --git a/debug/Makefile b/debug/Makefile index 357f888246..bc37e466ee 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -108,6 +108,7 @@ CFLAGS-tst-longjmp_chk2.c += -fexceptions -fasynchronous-unwind-tables CPPFLAGS-tst-longjmp_chk2.c += -D_FORTIFY_SOURCE=1 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 # We know these tests have problems with format strings, this is what # we are testing. Disable that warning. They are also testing @@ -155,7 +156,7 @@ 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-backtrace4 tst-backtrace5 tst-backtrace6 tst-realpath-chk ifeq ($(have-ssp),yes) tests += tst-ssp-1 diff --git a/debug/tst-realpath-chk.c b/debug/tst-realpath-chk.c new file mode 100644 index 0000000000..a8fcb327c4 --- /dev/null +++ b/debug/tst-realpath-chk.c @@ -0,0 +1,37 @@ +/* Smoke test to verify that realpath does not cause spurious warnings. + 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 + 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 +#include + +#include +#include + +static int +do_test (void) +{ +#ifdef PATH_MAX + char buf[PATH_MAX + 1]; + char *res = realpath (".", buf); + TEST_VERIFY (res == buf); +#endif + + return 0; +} + +#include diff --git a/stdlib/bits/stdlib.h b/stdlib/bits/stdlib.h index 067115eeca..ccacbdf76a 100644 --- a/stdlib/bits/stdlib.h +++ b/stdlib/bits/stdlib.h @@ -42,7 +42,7 @@ __NTH (realpath (const char *__restrict __name, char *__restrict __resolved)) return __realpath_alias (__name, __resolved); #if defined _LIBC_LIMITS_H_ && defined PATH_MAX - if (__glibc_unsafe_len (sz, sizeof (char), PATH_MAX)) + if (__glibc_unsafe_len (PATH_MAX, sizeof (char), sz)) return __realpath_chk_warn (__name, __resolved, sz); #endif return __realpath_chk (__name, __resolved, sz); -- 2.35.1