From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 4DE634C8B; Wed, 27 Feb 2019 10:50:08 +0100 (CET) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Feb 2019 01:50:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,419,1544515200"; d="scan'208";a="142018151" Received: from bricha3-mobl.ger.corp.intel.com ([10.237.221.36]) by orsmga001.jf.intel.com with SMTP; 27 Feb 2019 01:49:58 -0800 Received: by (sSMTP sendmail emulation); Wed, 27 Feb 2019 09:49:57 +0000 Date: Wed, 27 Feb 2019 09:49:57 +0000 From: Bruce Richardson To: Chaitanya Babu Talluri Cc: dev@dpdk.org, reshma.pattan@intel.com, jananeex.m.parthasarathy@intel.com, rmody@marvell.com, shshaikh@marvell.com, beilei.xing@intel.com, qi.z.zhang@intel.com, alejandro.lucero@netronome.com, pablo.de.lara.guarch@intel.com, declan.doherty@intel.com, stable@dpdk.org Message-ID: <20190227094957.GB91912@bricha3-MOBL.ger.corp.intel.com> References: <1547825033-3595-1-git-send-email-tallurix.chaitanya.babu@intel.com> <1551247371-32624-1-git-send-email-tallurix.chaitanya.babu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1551247371-32624-1-git-send-email-tallurix.chaitanya.babu@intel.com> User-Agent: Mutt/1.11.2 (2019-01-07) Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH v3] drivers: fix to replace strcat with strlcat X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Feb 2019 09:50:08 -0000 On Wed, Feb 27, 2019 at 06:02:51AM +0000, Chaitanya Babu Talluri wrote: > Strcat does not check the destination length and there might be > chances of string overflow so instead of strcat, strlcat is used. > > Fixes: 540a211084 ("bnx2x: driver core") > Fixes: e163c18a15 ("net/i40e: update ptype and pctype info") > Fixes: ef28aa96e5 ("net/nfp: support multiprocess") > Fixes: 6f4eec2565 ("test/crypto: enhance scheduler unit tests") > Cc: stable@dpdk.org > > Signed-off-by: Chaitanya Babu Talluri > --- > v3: Instead of strncat, used strlcat. > v2: Instead of strncat, used snprintf. > --- > drivers/net/bnx2x/bnx2x.c | 6 ++++-- > drivers/net/i40e/i40e_ethdev.c | 6 ++++-- > drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 10 ++++++---- > test/test/test_cryptodev.c | 5 ++++- > 4 files changed, 18 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c > index 4c775c163..e418fd7d1 100644 > --- a/drivers/net/bnx2x/bnx2x.c > +++ b/drivers/net/bnx2x/bnx2x.c > @@ -11734,13 +11734,15 @@ static const char *get_bnx2x_flags(uint32_t flags) > > for (i = 0; i < 5; i++) > if (flags & (1 << i)) { > - strcat(flag_str, flag[i]); > + strlcat(flag_str, flag[i], > + BNX2X_INFO_STR_MAX - strlen(flag_str) - 1); > flags ^= (1 << i); > } > if (flags) { > static char unknown[BNX2X_INFO_STR_MAX]; > snprintf(unknown, 32, "Unknown flag mask %x", flags); > - strcat(flag_str, unknown); > + strlcat(flag_str, unknown, > + BNX2X_INFO_STR_MAX - strlen(flag_str) - 1); > } This doesn't look right to me. "Strlcat" takes the saner approach of having the length parameter being total length so subtraction etc. should not be necessary. I think this should just be "strlcat(flag_str, unknown, BNX2X_INFO_STR_MAX);"