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 EFD5345BDF;
Sat, 26 Oct 2024 12:26:40 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 51A7E4068E;
Sat, 26 Oct 2024 12:26:03 +0200 (CEST)
Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190])
by mails.dpdk.org (Postfix) with ESMTP id 5B0E24042C
for <dev@dpdk.org>; Sat, 26 Oct 2024 12:25:52 +0200 (CEST)
Received: from mail.maildlp.com (unknown [172.19.88.234])
by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4XbG472FlYz20qqS;
Sat, 26 Oct 2024 18:24:55 +0800 (CST)
Received: from kwepemf500004.china.huawei.com (unknown [7.202.181.242])
by mail.maildlp.com (Postfix) with ESMTPS id 4C1B814010D;
Sat, 26 Oct 2024 18:25:50 +0800 (CST)
Received: from localhost.localdomain (10.28.79.22) by
kwepemf500004.china.huawei.com (7.202.181.242) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.2.1544.11; Sat, 26 Oct 2024 18:25:49 +0800
From: Jie Hai <haijie1@huawei.com>
To: <dev@dpdk.org>, <thomas@monjalon.net>, <ferruh.yigit@amd.com>, Jakub
Palider <jpalider@marvell.com>, Tomasz Duszynski <tduszynski@marvell.com>,
Jerin Jacob <jerinj@marvell.com>
CC: <lihuisong@huawei.com>, <fengchengwen@huawei.com>, <haijie1@huawei.com>,
<huangdengdui@huawei.com>
Subject: [PATCH v4 11/13] raw/cnxk_gpio: replace strtok with reentrant version
Date: Sat, 26 Oct 2024 18:14:49 +0800
Message-ID: <20241026101451.29135-12-haijie1@huawei.com>
X-Mailer: git-send-email 2.22.0
In-Reply-To: <20241026101451.29135-1-haijie1@huawei.com>
References: <20231113104550.2138654-1-haijie1@huawei.com>
<20241026101451.29135-1-haijie1@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
X-Originating-IP: [10.28.79.22]
X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To
kwepemf500004.china.huawei.com (7.202.181.242)
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: ecc0dd455e9a ("raw/cnxk_gpio: add option to select subset of GPIOs")
Cc: stable@dpdk.org
Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
drivers/raw/cnxk_gpio/cnxk_gpio.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/raw/cnxk_gpio/cnxk_gpio.c b/drivers/raw/cnxk_gpio/cnxk_gpio.c
index 329ac28a2736..bad70ecb1985 100644
--- a/drivers/raw/cnxk_gpio/cnxk_gpio.c
+++ b/drivers/raw/cnxk_gpio/cnxk_gpio.c
@@ -192,7 +192,7 @@ static int
cnxk_gpio_parse_allowlist(struct cnxk_gpiochip *gpiochip, char *allowlist)
{
int i, ret, val, queue = 0;
- char *token;
+ char *token, *sp = NULL;
int *list;
list = rte_calloc(NULL, gpiochip->num_gpios, sizeof(*list), 0);
@@ -210,7 +210,7 @@ cnxk_gpio_parse_allowlist(struct cnxk_gpiochip *gpiochip, char *allowlist)
allowlist[strlen(allowlist) - 1] = ' ';
/* quiesce -Wcast-qual */
- token = strtok((char *)(uintptr_t)allowlist, ",");
+ token = strtok_r((char *)(uintptr_t)allowlist, ",", &sp);
do {
errno = 0;
val = strtol(token, NULL, 10);
@@ -236,7 +236,7 @@ cnxk_gpio_parse_allowlist(struct cnxk_gpiochip *gpiochip, char *allowlist)
}
if (i == queue)
list[queue++] = val;
- } while ((token = strtok(NULL, ",")));
+ } while ((token = strtok_r(NULL, ",", &sp)));
free(allowlist);
gpiochip->allowlist = list;
--
2.22.0