From nobody Fri Apr 26 21:51:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1599916155; cv=none; d=zohomail.com; s=zohoarc; b=FfBQLpzqmoK0v4FHABOLvegQ8FDLwd0LGxEJX/agj22aoIIwWGuwQqR0st3f/ZcGttOa7fGt48bUmpBVND4HrcvZs+qTD9aUThJ5tgmfiZBSZojmJ4n/SXlmQSN2bWt5fzKNyVu4ONLGyTiBBIOVoVw7QjwVmHw5nX6ZAH4mmo0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599916155; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=EMaTvRD3LgK+xfaSufQHF3Pvw9d13TPjpCjgUD+4O0g=; b=hyqg6E6yay5Gp/3gXCRvtSwBOKREH6riH7rJi1AHL7LfRlEtDdEOfD/NCKUcBdyrbWJC1d4WEoWKk/WhNICe2kTv0vA3jB6BWzswnSLkFqnOak2Ir6dwuRt5xKZuI7DVY6PydEZKlzwKsoXkpph4Veic8K2GTiNAD4yx+6oNi+Q= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 15999161551901004.6212303011921; Sat, 12 Sep 2020 06:09:15 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kH5Gj-0006pT-E5; Sat, 12 Sep 2020 13:08:41 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kH5Gi-0006pO-L9 for xen-devel@lists.xenproject.org; Sat, 12 Sep 2020 13:08:40 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9bbce8aa-958b-43c6-b72f-9650b112f752; Sat, 12 Sep 2020 13:08:39 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 570A4AD0B; Sat, 12 Sep 2020 13:08:54 +0000 (UTC) X-Inumbo-ID: 9bbce8aa-958b-43c6-b72f-9650b112f752 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Ian Jackson , Wei Liu Subject: [PATCH v3] tools/libs/stat: fix broken build Date: Sat, 12 Sep 2020 15:08:36 +0200 Message-Id: <20200912130836.11024-1-jgross@suse.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" Making getBridge() static triggered a build error with some gcc versions: error: 'strncpy' output may be truncated copying 15 bytes from a string of length 255 [-Werror=3Dstringop-truncation] Fix that by using a buffer with 256 bytes instead. Fixes: 6d0ec053907794 ("tools: split libxenstat into new tools/libs/stat di= rectory") Signed-off-by: Juergen Gross Acked-by: Wei Liu Reviewed-by: Bertrand Marquis --- tools/libs/stat/xenstat_linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libs/stat/xenstat_linux.c b/tools/libs/stat/xenstat_linu= x.c index 793263f2b6..d2ee6fda64 100644 --- a/tools/libs/stat/xenstat_linux.c +++ b/tools/libs/stat/xenstat_linux.c @@ -78,7 +78,7 @@ static void getBridge(char *excludeName, char *result, si= ze_t resultLen) sprintf(tmp, "/sys/class/net/%s/bridge", de->d_name); =20 if (access(tmp, F_OK) =3D=3D 0) { - strncpy(result, de->d_name, resultLen - 1); + strncpy(result, de->d_name, resultLen); result[resultLen - 1] =3D 0; } } @@ -264,7 +264,7 @@ int xenstat_collect_networks(xenstat_node * node) { /* Helper variables for parseNetDevLine() function defined above */ int i; - char line[512] =3D { 0 }, iface[16] =3D { 0 }, devBridge[16] =3D { 0 }, d= evNoBridge[17] =3D { 0 }; + char line[512] =3D { 0 }, iface[16] =3D { 0 }, devBridge[256] =3D { 0 }, = devNoBridge[257] =3D { 0 }; unsigned long long rxBytes, rxPackets, rxErrs, rxDrops, txBytes, txPacket= s, txErrs, txDrops; =20 struct priv_data *priv =3D get_priv_data(node->handle); --=20 2.26.2