From patchwork Fri Dec 17 13:57:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 49050 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 8F57B385842D for ; Fri, 17 Dec 2021 13:58:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8F57B385842D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1639749489; bh=jU6s+arFvxukQLSCu2CC5gehAqSvrz8HGGWPJVSTE6o=; 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=ZuP7UeYiMuQGIshYr6rFj7Ya5dkvUIen1GpVM1k9V51WQtOtJAtDuVPIrnsTmiJhg G7VZuiqZpCow94xap1sO2oih9G016q0rpL5w90LzAT3VWE/W5yL8g2GOznRl473ooX 7KOTCuSFbcFeYa1BZA4bv+P6tQmrpre15gpySECE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from butterfly.birch.relay.mailchannels.net (butterfly.birch.relay.mailchannels.net [23.83.209.27]) by sourceware.org (Postfix) with ESMTPS id BD8F93858D28 for ; Fri, 17 Dec 2021 13:57:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BD8F93858D28 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 B41508C1208; Fri, 17 Dec 2021 13:57:39 +0000 (UTC) Received: from pdx1-sub0-mail-a306.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 3F1D98C19AC; Fri, 17 Dec 2021 13:57:39 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a306.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.109.250.15 (trex/6.4.3); Fri, 17 Dec 2021 13:57:39 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Inform-Callous: 5ddf5b7b1fc5a2df_1639749459529_895687752 X-MC-Loop-Signature: 1639749459528:1036878009 X-MC-Ingress-Time: 1639749459528 Received: from rhbox.redhat.com (unknown [1.6.40.51]) (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-a306.dreamhost.com (Postfix) with ESMTPSA id 4JFrCP5Bfdz26; Fri, 17 Dec 2021 05:57:37 -0800 (PST) To: libc-alpha@sourceware.org Subject: [committed] fortify: Fix spurious warning with realpath Date: Fri, 17 Dec 2021 19:27:25 +0530 Message-Id: <20211217135725.82011-1-siddhesh@sourceware.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <3cd73fd5-3624-d73c-e97c-f6ee7cae7563@linaro.org> References: <3cd73fd5-3624-d73c-e97c-f6ee7cae7563@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1171.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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" 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 --- 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);