From nobody Fri Apr 26 00:24:47 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; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1601913971; cv=none; d=zohomail.com; s=zohoarc; b=a03EqVaMSd84KjUH15IZZ8FSQXfuepwDXfYBp1Gw+AWUfQwgA8zXxDYLDiFB3H8EVW+GiJ1JlgRW4Y6GVf8vnumtQ41MwdSkxqrB7jn/Ubrxk1xyYdE3XkG5+xtF39cjraByzbkMe9VckQLNvXz8JJOjtpOfU34Pn+MStVrJ0i0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601913971; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=CbLvlwSHGv2Ei7NU2HvH7oqc3orNoizFG4vvT23zpwM=; b=dPnIOORUqp1kERuhnoBWjprh0zY71eiG8sr2AY+OhQg93qnT5t3cxDhFusahNwXT7OEWqvFl0K4nkCqeb1NJpz7kMTBpnyxpTD/zOTxRsYTIbcipJ3n21rFWP3nc+BGgURIjwhXLSyCx56LGHN9hd3lDap/fkNH00ixCeycVbqk= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1601913971222562.0570376033252; Mon, 5 Oct 2020 09:06:11 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.3053.8832 (Exim 4.92) (envelope-from ) id 1kPSze-0004aA-Kh; Mon, 05 Oct 2020 16:05:42 +0000 Received: by outflank-mailman (output) from mailman id 3053.8832; Mon, 05 Oct 2020 16:05:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kPSze-0004Zy-BV; Mon, 05 Oct 2020 16:05:42 +0000 Received: by outflank-mailman (input) for mailman id 3053; Mon, 05 Oct 2020 16:05:41 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kPSzc-0004ZS-W7 for xen-devel@lists.xenproject.org; Mon, 05 Oct 2020 16:05:41 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 45f20369-f9e3-40b3-a7fc-4ebc56793578; Mon, 05 Oct 2020 16:05:40 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AAA511435; Mon, 5 Oct 2020 09:05:39 -0700 (PDT) Received: from e109506-lin.cambridge.arm.com (e109506-lin.cambridge.arm.com [10.1.198.23]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 03B2A3F66B; Mon, 5 Oct 2020 09:05:38 -0700 (PDT) Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kPSzc-0004ZS-W7 for xen-devel@lists.xenproject.org; Mon, 05 Oct 2020 16:05:41 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 45f20369-f9e3-40b3-a7fc-4ebc56793578; Mon, 05 Oct 2020 16:05:40 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AAA511435; Mon, 5 Oct 2020 09:05:39 -0700 (PDT) Received: from e109506-lin.cambridge.arm.com (e109506-lin.cambridge.arm.com [10.1.198.23]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 03B2A3F66B; Mon, 5 Oct 2020 09:05:38 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 45f20369-f9e3-40b3-a7fc-4ebc56793578 From: Bertrand Marquis To: xen-devel@lists.xenproject.org Cc: jgross@suse.com, Ian Jackson , Wei Liu Subject: [PATCH 1/2] tools: use memcpy instead of strncpy in getBridge Date: Mon, 5 Oct 2020 17:02:48 +0100 Message-Id: <3de58159c6fde0cdfa4d0f292fa55fdb931cb3aa.1601913536.git.bertrand.marquis@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use memcpy in getBridge to prevent gcc warnings about truncated strings. We know that we might truncate it, so the gcc warning here is wrong. Revert previous change changing buffer sizes as bigger buffers are not needed. Signed-off-by: Bertrand Marquis --- tools/libs/stat/xenstat_linux.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/libs/stat/xenstat_linux.c b/tools/libs/stat/xenstat_linu= x.c index d2ee6fda64..1db35c604c 100644 --- a/tools/libs/stat/xenstat_linux.c +++ b/tools/libs/stat/xenstat_linux.c @@ -78,7 +78,12 @@ static void getBridge(char *excludeName, char *result, s= ize_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); + /* + * Do not use strncpy to prevent compiler warning with + * gcc >=3D 10.0 + * If de->d_name is longer then resultLen we truncate it + */ + memcpy(result, de->d_name, resultLen - 1); result[resultLen - 1] =3D 0; } } @@ -264,7 +269,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[256] =3D { 0 }, = devNoBridge[257] =3D { 0 }; + char line[512] =3D { 0 }, iface[16] =3D { 0 }, devBridge[16] =3D { 0 }, d= evNoBridge[17] =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.17.1