From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id E57435587; Mon, 21 Jan 2019 11:44:14 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Jan 2019 02:44:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,502,1539673200"; d="scan'208";a="136410733" Received: from irsmsx101.ger.corp.intel.com ([163.33.3.153]) by fmsmga002.fm.intel.com with ESMTP; 21 Jan 2019 02:44:11 -0800 Received: from irsmsx103.ger.corp.intel.com ([169.254.3.60]) by IRSMSX101.ger.corp.intel.com ([169.254.1.213]) with mapi id 14.03.0415.000; Mon, 21 Jan 2019 10:43:53 +0000 From: "Parthasarathy, JananeeX M" To: "dev@dpdk.org" CC: "rmody@marvell.com" , "Pattan, Reshma" , "shshaikh@marvell.com" , "Xing, Beilei" , "Zhang, Qi Z" , "alejandro.lucero@netronome.com" , "De Lara Guarch, Pablo" , "Doherty, Declan" , "Chaitanya Babu, TalluriX" , "stable@dpdk.org" , "Yigit, Ferruh" Thread-Topic: [dpdk-dev] [PATCH v2] drivers: fix to replace strcat with strncat Thread-Index: AQHUr0Iaj/tnHo7hg0mfl2hB2s2Vz6W5jYVA Date: Mon, 21 Jan 2019 10:43:52 +0000 Message-ID: <7AE31235A30B41498D1C31348DC858BD5B5217F4@IRSMSX103.ger.corp.intel.com> References: <1547445875-24601-1-git-send-email-tallurix.chaitanya.babu@intel.com> <1547825033-3595-1-git-send-email-tallurix.chaitanya.babu@intel.com> In-Reply-To: <1547825033-3595-1-git-send-email-tallurix.chaitanya.babu@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [163.33.239.180] Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-dev] [PATCH v2] drivers: fix to replace strcat with strncat X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2019 10:44:15 -0000 >-----Original Message----- >From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Chaitanya Babu Talluri >Sent: Friday, January 18, 2019 8:54 PM >To: dev@dpdk.org >Cc: rmody@marvell.com; Pattan, Reshma ; >shshaikh@marvell.com; Xing, Beilei ; Zhang, Qi Z >; alejandro.lucero@netronome.com; De Lara Guarch, >Pablo ; Doherty, Declan >; Chaitanya Babu, TalluriX >; stable@dpdk.org >Subject: [dpdk-dev] [PATCH v2] drivers: fix to replace strcat with strncat > >Strcat does not check the destination length and there might be chances of >string overflow so insted of strcat, strncat 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 >--- >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 | 8 +++++--- > test/test/test_cryptodev.c | 3 ++- > 4 files changed, 15 insertions(+), 8 deletions(-) > >diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index >4c775c163..0e1e6447a 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 =3D 0; i < 5; i++) > if (flags & (1 << i)) { >- strcat(flag_str, flag[i]); >+ strncat(flag_str, flag[i], >+ BNX2X_INFO_STR_MAX - strlen(flag_str) - 1); > flags ^=3D (1 << i); > } > if (flags) { > static char unknown[BNX2X_INFO_STR_MAX]; > snprintf(unknown, 32, "Unknown flag mask %x", flags); >- strcat(flag_str, unknown); >+ strncat(flag_str, unknown, >+ BNX2X_INFO_STR_MAX - strlen(flag_str) - 1); > } > return flag_str; > } >diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev= .c >index 8dc1a4af8..56867ff84 100644 >--- a/drivers/net/i40e/i40e_ethdev.c >+++ b/drivers/net/i40e/i40e_ethdev.c >@@ -12175,8 +12175,10 @@ i40e_update_customized_pctype(struct >rte_eth_dev *dev, uint8_t *pkg, > for (n =3D 0; n < proto_num; n++) { > if (proto[n].proto_id !=3D proto_id) > continue; >- strcat(name, proto[n].name); >- strcat(name, "_"); >+ strncat(name, proto[n].name, >+ sizeof(name) - strlen(name) - 1); >+ strncat(name, "_", >+ sizeof(name) - strlen(name) - 1); > break; > } > } >diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c >b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c >index 39bd48a83..a9c727185 100644 >--- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c >+++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c >@@ -73,6 +73,8 @@ > #define NFP_PCIE_CPP_BAR_PCIETOCPPEXPBAR(bar, slot) \ > (((bar) * 8 + (slot)) * 4) > >+#define LOCKFILE_HOME_PATH 256 >+ > /* > * Define to enable a bit more verbose debug output. > * Set to 1 to enable a bit more verbose debug output. >@@ -685,11 +687,11 @@ nfp_acquire_secondary_process_lock(struct >nfp_pcie_user *desc) > * driver is used because that implies root user. > */ > home_path =3D getenv("HOME"); >- lockfile =3D calloc(strlen(home_path) + strlen(lockname) + 1, >+ lockfile =3D calloc(LOCKFILE_HOME_PATH + strlen(lockname) + 1, > sizeof(char)); > >- strcat(lockfile, home_path); >- strcat(lockfile, "/.lock_nfp_secondary"); >+ snprintf(lockfile, LOCKFILE_HOME_PATH + strlen(lockname), >+ "%s%s", home_path, lockname); > desc->secondary_lock =3D open(lockfile, O_RDWR | O_CREAT | >O_NONBLOCK, > 0666); > if (desc->secondary_lock < 0) { >diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c index >84065eb49..a979603b9 100644 >--- a/test/test/test_cryptodev.c >+++ b/test/test/test_cryptodev.c >@@ -374,7 +374,8 @@ testsuite_setup(void) > snprintf(vdev_args, sizeof(vdev_args), > "%s%d", temp_str, i); > strcpy(temp_str, vdev_args); >- strcat(temp_str, ";"); >+ strncat(temp_str, ";", >+ VDEV_ARGS_SIZE - strlen(temp_str) - >1); > slave_core_count++; > socket_id =3D lcore_config[i].socket_id; > } >-- >2.17.2 Any Review Please!! -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the s= ole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact = the sender and delete all copies.