From patchwork Tue Jul 25 15:16:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 73166 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 489B7385AFA2 for ; Tue, 25 Jul 2023 15:17:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 489B7385AFA2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690298279; bh=e4ibtImdR3M6FkFeEcuzMp4XHBv/txEg8FqC6BJAzh0=; 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=cRRtqyKZ0qduYGW9I7L9aUQlQ84WzKRSk7iXle+tL93m5jyezgPcIptUXTgOQS0Hd TkKk+IJX0G7cKUYwT2kloXRx2HHOYM97ahqyl1CGthWT4YOmAW5uBx2r0e7YKDxo2w tCOyDEvVR1CYNEs8gNVuyC4Y5wdKUDQ+oSzZZQJY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x34.google.com (mail-oa1-x34.google.com [IPv6:2001:4860:4864:20::34]) by sourceware.org (Postfix) with ESMTPS id 90A06385AFA2 for ; Tue, 25 Jul 2023 15:16:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 90A06385AFA2 Received: by mail-oa1-x34.google.com with SMTP id 586e51a60fabf-1bb29ae5975so2748609fac.2 for ; Tue, 25 Jul 2023 08:16:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690298214; x=1690903014; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e4ibtImdR3M6FkFeEcuzMp4XHBv/txEg8FqC6BJAzh0=; b=K7D9balQ9LB1Tf+B7AVhQlLOkbRhhEURER8td8XkecTC3AJADrBa0DwNPESkPOtumf TziXNzXQDK8kC7Gb5LjL4qnV1vAnIcgLfc6rBVGm4xzaB5jP8lx785sVWEvzbfHviOzS vFUnptJzT82jXYZq29VatWAyOSYVwvF+5dnFLW33Qma8Qz4hwalLDYXWOgusz31fwmxq E7sCjLQPv11gmGq+eMkAWfuK6ylk76fm/O8HH5Dl9i/JxK641D9e1N1rsS5wFV/cgVMR u26OQ1KDclzOkpnZGrV5ZOTFkefd48GNSpq9oywiPO5wC1nWkxN7qW48sNC1PfOklMNn qa8A== X-Gm-Message-State: ABy/qLawhP9CYF5wW1gwNAScpeNuKr0glq8dqggs7mEB8L/ei+wArupn rtRhFr6diXjhUISARkiye/3K0dxKUv5XBWLiR9aWwg== X-Google-Smtp-Source: APBJJlGw+K49a7vF9NMyK6v+9zoxLyyZkfPcBIQ6kV+r9pYxKVdBd1DzpOzM2j7b/aSlAtzOVshxJQ== X-Received: by 2002:a05:6870:c110:b0:1a6:4f6a:8a72 with SMTP id f16-20020a056870c11000b001a64f6a8a72mr17109732oad.37.1690298214162; Tue, 25 Jul 2023 08:16:54 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:d4d2:3277:e224:7a6f:4feb]) by smtp.gmail.com with ESMTPSA id ea3-20020a056870070300b001bb9d01fe3dsm525439oab.5.2023.07.25.08.16.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 08:16:53 -0700 (PDT) To: libc-alpha@sourceware.org, Frederic Berat Subject: [PATCH 4/4] string: Fix tester build with fortify enable with gcc 6 Date: Tue, 25 Jul 2023 12:16:41 -0300 Message-Id: <20230725151641.923083-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230725151641.923083-1-adhemerval.zanella@linaro.org> References: <20230725151641.923083-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" When building with fortify enabled, GCC 6 issues an warning the fortify wrapper might overflow the destination buffer. However, GCC does not provide a specific flag to disable the warning (the failure is tied to -Werror). So to avoid disable all errors, only enable the check for GCC 7 or newer. Checked on i686-linux-gnu. Reviewed-by: Carlos O'Donell --- string/tester.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/string/tester.c b/string/tester.c index da42c72141..f7d4bac5a8 100644 --- a/string/tester.c +++ b/string/tester.c @@ -385,8 +385,17 @@ test_strncat (void) (void) strcpy (one, "gh"); (void) strcpy (two, "ef"); + /* When building with fortify enabled, GCC 6 issues an warning the fortify + wrapper might overflow the destination buffer. However, GCC does not + provide a specific flag to disable the warning (the failure is tied to + -Werror). So to avoid disable all errors, only enable the check for + GCC 7 or newer. */ +#if __GNUC_PREREQ (7, 0) (void) strncat (one, two, 99); equal (one, "ghef", 5); /* Basic test encore. */ +#else + equal (one, "gh", 2); +#endif equal (two, "ef", 6); /* Stomped on source? */ (void) strcpy (one, "");