From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 8B3A543325;
Tue, 14 Nov 2023 09:48:38 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 0D59640E54;
Tue, 14 Nov 2023 09:47:32 +0100 (CET)
Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188])
by mails.dpdk.org (Postfix) with ESMTP id A42314068A
for <dev@dpdk.org>; Tue, 14 Nov 2023 09:47:19 +0100 (CET)
Received: from kwepemd100004.china.huawei.com (unknown [172.30.72.53])
by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4SV0KF0059zWhBk;
Tue, 14 Nov 2023 16:46:56 +0800 (CST)
Received: from localhost.localdomain (10.67.165.2) by
kwepemd100004.china.huawei.com (7.221.188.31) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
15.2.1258.23; Tue, 14 Nov 2023 16:47:17 +0800
From: Jie Hai <haijie1@huawei.com>
To: <dev@dpdk.org>, Hemant Agrawal <hemant.agrawal@nxp.com>, Sachin Saxena
<sachin.saxena@nxp.com>, Nipun Gupta <nipun.gupta@amd.com>, Shreyansh Jain
<shreyansh.jain@nxp.com>, Santosh Shukla <santosh.shukla@caviumnetworks.com>,
Ferruh Yigit <ferruh.yigit@intel.com>
CC: <haijie1@huawei.com>, <lihuisong@huawei.com>, <fengchengwen@huawei.com>
Subject: [PATCH v2 15/22] bus/fslmc: replace strtok with reentrant version
Date: Tue, 14 Nov 2023 16:41:26 +0800
Message-ID: <20231114084133.3573959-16-haijie1@huawei.com>
X-Mailer: git-send-email 2.30.0
In-Reply-To: <20231114084133.3573959-1-haijie1@huawei.com>
References: <20231113104550.2138654-1-haijie1@huawei.com>
<20231114084133.3573959-1-haijie1@huawei.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Originating-IP: [10.67.165.2]
X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To
kwepemd100004.china.huawei.com (7.221.188.31)
X-CFilter-Loop: Reflected
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Multiple threads calling the same function may cause condition
race issues, which often leads to abnormal behavior and can cause
more serious vulnerabilities such as abnormal termination, denial
of service, and compromised data integrity.
The strtok() is non-reentrant, it is better to replace it with a
reentrant version.
Fixes: 9ccb76b24c1d ("bus/fslmc: enable portal interrupt handling")
Fixes: 828d51d8fc3e ("bus/fslmc: refactor scan and probe functions")
Cc: stable@dpdk.org
Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
---
drivers/bus/fslmc/fslmc_bus.c | 5 +++--
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c
index 57bfb5111a97..2aa0e45c3d1b 100644
--- a/drivers/bus/fslmc/fslmc_bus.c
+++ b/drivers/bus/fslmc/fslmc_bus.c
@@ -131,6 +131,7 @@ scan_one_fslmc_device(char *dev_name)
{
char *dup_dev_name, *t_ptr;
struct rte_dpaa2_device *dev = NULL;
+ char *sp = NULL;
int ret = -1;
if (!dev_name)
@@ -168,7 +169,7 @@ scan_one_fslmc_device(char *dev_name)
}
/* Parse the device name and ID */
- t_ptr = strtok(dup_dev_name, ".");
+ t_ptr = strtok_s(dup_dev_name, ".", &sp);
if (!t_ptr) {
DPAA2_BUS_ERR("Invalid device found: (%s)", dup_dev_name);
ret = -EINVAL;
@@ -199,7 +200,7 @@ scan_one_fslmc_device(char *dev_name)
else
dev->dev_type = DPAA2_UNKNOWN;
- t_ptr = strtok(NULL, ".");
+ t_ptr = strtok_s(NULL, ".", &sp);
if (!t_ptr) {
DPAA2_BUS_ERR("Skipping invalid device (%s)", dup_dev_name);
ret = 0;
diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
index 4aec7b2cd8ba..b788d7681866 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
@@ -129,7 +129,7 @@ dpaa2_affine_dpio_intr_to_respective_core(int32_t dpio_id, int cpu_id)
uint32_t cpu_mask = 1;
int ret;
size_t len = 0;
- char *temp = NULL, *token = NULL;
+ char *temp = NULL, *token = NULL, *sp = NULL;
char string[STRING_LEN], command[COMMAND_LEN];
FILE *file;
@@ -141,7 +141,7 @@ dpaa2_affine_dpio_intr_to_respective_core(int32_t dpio_id, int cpu_id)
}
while (getline(&temp, &len, file) != -1) {
if ((strstr(temp, string)) != NULL) {
- token = strtok(temp, ":");
+ token = strtok_s(temp, ":", &sp);
break;
}
}
--
2.30.0