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 4B07D91; Wed, 27 Feb 2019 07:03:46 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Feb 2019 22:03:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,418,1544515200"; d="scan'208";a="147646792" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga004.fm.intel.com with ESMTP; 26 Feb 2019 22:03:42 -0800 Received: from wgcvswdev001.ir.intel.com (wgcvswdev001.ir.intel.com [10.102.246.100]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id x1R63gcI031848; Wed, 27 Feb 2019 06:03:42 GMT Received: from wgcvswdev001.ir.intel.com (localhost [127.0.0.1]) by wgcvswdev001.ir.intel.com with ESMTP id x1R6349r000376; Wed, 27 Feb 2019 06:03:04 GMT Received: (from tchaitax@localhost) by wgcvswdev001.ir.intel.com with œ id x1R634mq000372; Wed, 27 Feb 2019 06:03:04 GMT From: Chaitanya Babu Talluri To: dev@dpdk.org Cc: 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, Chaitanya Babu Talluri , stable@dpdk.org Date: Wed, 27 Feb 2019 06:02:51 +0000 Message-Id: <1551247371-32624-1-git-send-email-tallurix.chaitanya.babu@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1547825033-3595-1-git-send-email-tallurix.chaitanya.babu@intel.com> References: <1547825033-3595-1-git-send-email-tallurix.chaitanya.babu@intel.com> Subject: [dpdk-dev] [PATCH v3] drivers: fix to replace strcat with strlcat 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: Wed, 27 Feb 2019 06:03:47 -0000 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); } return flag_str; } diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index dca61f03a..fac4e943f 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -12201,8 +12201,10 @@ i40e_update_customized_pctype(struct rte_eth_dev *dev, uint8_t *pkg, for (n = 0; n < proto_num; n++) { if (proto[n].proto_id != proto_id) continue; - strcat(name, proto[n].name); - strcat(name, "_"); + strlcat(name, proto[n].name, + sizeof(name) - strlen(name) - 1); + strlcat(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..1c54cc600 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 = getenv("HOME"); - lockfile = calloc(strlen(home_path) + strlen(lockname) + 1, - sizeof(char)); + lockfile = 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 = 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 32f1893bc..e99756f60 100644 --- a/test/test/test_cryptodev.c +++ b/test/test/test_cryptodev.c @@ -11,6 +11,8 @@ #include #include #include +#include +#include #include #include @@ -375,7 +377,8 @@ testsuite_setup(void) snprintf(vdev_args, sizeof(vdev_args), "%s%d", temp_str, i); strcpy(temp_str, vdev_args); - strcat(temp_str, ";"); + strlcat(temp_str, ";", + VDEV_ARGS_SIZE - strlen(temp_str) - 1); slave_core_count++; socket_id = lcore_config[i].socket_id; } -- 2.17.2