From patchwork Fri Feb 22 04:09:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1046567 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Srh1M/5+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 445HtP4plwz9sBF for ; Fri, 22 Feb 2019 15:10:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727041AbfBVEJ6 (ORCPT ); Thu, 21 Feb 2019 23:09:58 -0500 Received: from mail-ot1-f67.google.com ([209.85.210.67]:43836 "EHLO mail-ot1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726995AbfBVEJ4 (ORCPT ); Thu, 21 Feb 2019 23:09:56 -0500 Received: by mail-ot1-f67.google.com with SMTP id n71so776729ota.10; Thu, 21 Feb 2019 20:09:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fB11OAjQTMSWomG1nU88AL6IibWleeoEtKkmtCRPDFk=; b=Srh1M/5+97RWTCpmGWsWQ7AxDlFan3jDLhaVmmPFhQaLgKUl5wNNqAgML05RKt5osS LGtaTsJQcKK47DeDbJlM3/yoYoIzAHkvfIZ92G0yWeLq3BOwsan+K/wp4U+ye0cBnyTR hurtI6BFtVLxBCsc1mUgEVOYDg9ity1q9qysELvui3hU2xqF/xl3+lJI0vBgdtcCFdsg nosNZrIDRg5q9HDmTUCe+zWg4Fe7Zu+C/7eJDnKxRyMDC9UM0yr5l2G2OjhmYpLIMisn PdysrJESm55ZiLFTbeLMP+66eeUYVYP3IlYY0YcTmRrxK24V61s0ZTKeUZpQY2vMfa2j FH9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fB11OAjQTMSWomG1nU88AL6IibWleeoEtKkmtCRPDFk=; b=W6kqdRkkhGc4O/iF1CLlkxuB27isTnmaOZWfgF0OPqTMLzJC4+jb41jvT/OUCjUFKy sgJlW5cLOsgZozY2/9LDeQYTQra7LacntsCHn7pE6f00UaUnyXnNSJ/cfOw19SFTbGb7 mYEsapKvZwcM2MW83UwyjnMdFSjvfUoQPQETTY9wmyhlGT2fGkCwSn2LjBy7UIT9Nmw2 V2qaovAA3+08TdvaeZa182tYpV0bApJuEqrTcpxYXTrmIIPDorQdLjb+INws59tLmzbV BNqLynQumPv9fW0BIqPVZe3qkCznkXVCgIut/bpOAc7dHTz0oD8NDXj0n2HmycJKrF+X ZEYw== X-Gm-Message-State: AHQUAuZQB1M+eQC9uIL9hbBS7rJFEo3qDPWAeMyhRYjsX5xXk6VAbZUO rvq8jV4YJ2WmiC0nHR/tPYjy+kvq X-Google-Smtp-Source: AHgI3IYlpQiuRF40WD3/qIFR9LJhUk6GVmfeGDgmoXmpllDEPNwK2mgUBWsB4vpjYiKUXd7yiWhlpA== X-Received: by 2002:a9d:7554:: with SMTP id b20mr1354832otl.32.1550808594677; Thu, 21 Feb 2019 20:09:54 -0800 (PST) Received: from localhost.localdomain (ip68-228-73-187.oc.oc.cox.net. [68.228.73.187]) by smtp.gmail.com with ESMTPSA id r1sm167836otk.48.2019.02.21.20.09.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Feb 2019 20:09:53 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, Florian Fainelli , Alexei Starovoitov , Daniel Borkmann , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Toshiaki Makita , David Ahern , Michael Walle , Li RongQing , linux-kernel@vger.kernel.org (open list), xdp-newbies@vger.kernel.org (open list:XDP (eXpress Data Path)) Subject: [PATCH net-next 4/4] veth: Fix -Wformat-truncation Date: Thu, 21 Feb 2019 20:09:29 -0800 Message-Id: <20190222040929.16657-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190222040929.16657-1-f.fainelli@gmail.com> References: <20190222040929.16657-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Provide a precision hint to snprintf() in order to eliminate a -Wformat-truncation warning provided below. A maximum of 11 characters is allowed to reach a maximum of 32 - 1 characters given a possible maximum value of queues using up to UINT_MAX which occupies 10 characters. Incidentally 11 is the number of characters for "xdp_packets" which is the largest string we append. drivers/net/veth.c: In function 'veth_get_strings': drivers/net/veth.c:118:47: warning: '%s' directive output may be truncated writing up to 31 bytes into a region of size between 12 and 21 [-Wformat-truncation=] snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_%s", ^~ drivers/net/veth.c:118:5: note: 'snprintf' output between 12 and 52 bytes into a destination of size 32 snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_%s", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ i, veth_rq_stats_desc[j].desc); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Florian Fainelli --- drivers/net/veth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/veth.c b/drivers/net/veth.c index fbf890ebbeae..569e87a51a33 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -115,7 +115,8 @@ static void veth_get_strings(struct net_device *dev, u32 stringset, u8 *buf) p += sizeof(ethtool_stats_keys); for (i = 0; i < dev->real_num_rx_queues; i++) { for (j = 0; j < VETH_RQ_STATS_LEN; j++) { - snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_%s", + snprintf(p, ETH_GSTRING_LEN, + "rx_queue_%u_%.11s", i, veth_rq_stats_desc[j].desc); p += ETH_GSTRING_LEN; }