From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 589EE45C76; Mon, 4 Nov 2024 12:12:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 34D9B40E72; Mon, 4 Nov 2024 12:10:57 +0100 (CET) Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by mails.dpdk.org (Postfix) with ESMTP id 0875C40E28 for ; Mon, 4 Nov 2024 12:10:43 +0100 (CET) Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4Xhpfz5Cgmz1ypCg; Mon, 4 Nov 2024 19:10:51 +0800 (CST) Received: from dggpeml500011.china.huawei.com (unknown [7.185.36.84]) by mail.maildlp.com (Postfix) with ESMTPS id 0AC95140120; Mon, 4 Nov 2024 19:10:42 +0800 (CST) Received: from localhost.huawei.com (10.50.165.33) by dggpeml500011.china.huawei.com (7.185.36.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Mon, 4 Nov 2024 19:10:41 +0800 From: Dengdui Huang To: CC: , , , , , , , , , , Subject: [PATCH v5 22/52] dma/idxd: replace strerror with reentrant version Date: Mon, 4 Nov 2024 19:10:07 +0800 Message-ID: <20241104111037.3632161-23-huangdengdui@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20241104111037.3632161-1-huangdengdui@huawei.com> References: <20231114082539.1858594-1-huangdengdui@huawei.com> <20241104111037.3632161-1-huangdengdui@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.50.165.33] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500011.china.huawei.com (7.185.36.84) X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The function strerror() is insecure in a multi-thread environment. This patch uses strerror_r() to replace it. Signed-off-by: Dengdui Huang Acked-by: Chengwen Feng Acked-by: Morten Brørup Acked-by: Huisong Li --- drivers/dma/idxd/idxd_bus.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/drivers/dma/idxd/idxd_bus.c b/drivers/dma/idxd/idxd_bus.c index ba8076715d..78137f3531 100644 --- a/drivers/dma/idxd/idxd_bus.c +++ b/drivers/dma/idxd/idxd_bus.c @@ -16,6 +16,7 @@ #include #include #include +#include #include "idxd_internal.h" @@ -136,6 +137,7 @@ static int read_wq_string(struct rte_dsa_device *dev, const char *filename, char *value, size_t valuelen) { + char errmsg[RTE_STRERR_BUFSIZE]; char sysfs_node[PATH_MAX]; int len; int fd; @@ -144,16 +146,20 @@ read_wq_string(struct rte_dsa_device *dev, const char *filename, dsa_get_sysfs_path(), dev->wq_name, filename); fd = open(sysfs_node, O_RDONLY); if (fd < 0) { + if (strerror_r(errno, errmsg, sizeof(errmsg)) != 0) + snprintf(errmsg, sizeof(errmsg), "Unknown error %d", errno); IDXD_PMD_ERR("%s(): opening file '%s' failed: %s", - __func__, sysfs_node, strerror(errno)); + __func__, sysfs_node, errmsg); return -1; } len = read(fd, value, valuelen - 1); close(fd); if (len < 0) { + if (strerror_r(errno, errmsg, sizeof(errmsg)) != 0) + snprintf(errmsg, sizeof(errmsg), "Unknown error %d", errno); IDXD_PMD_ERR("%s(): error reading file '%s': %s", - __func__, sysfs_node, strerror(errno)); + __func__, sysfs_node, errmsg); return -1; } value[len] = '\0'; @@ -164,6 +170,7 @@ static int read_wq_int(struct rte_dsa_device *dev, const char *filename, int *value) { + char errmsg[RTE_STRERR_BUFSIZE]; char sysfs_node[PATH_MAX]; FILE *f; int ret = 0; @@ -172,14 +179,18 @@ read_wq_int(struct rte_dsa_device *dev, const char *filename, dsa_get_sysfs_path(), dev->wq_name, filename); f = fopen(sysfs_node, "r"); if (f == NULL) { + if (strerror_r(errno, errmsg, sizeof(errmsg)) != 0) + snprintf(errmsg, sizeof(errmsg), "Unknown error %d", errno); IDXD_PMD_ERR("%s(): opening file '%s' failed: %s", - __func__, sysfs_node, strerror(errno)); + __func__, sysfs_node, errmsg); return -1; } if (fscanf(f, "%d", value) != 1) { + if (strerror_r(errno, errmsg, sizeof(errmsg)) != 0) + snprintf(errmsg, sizeof(errmsg), "Unknown error %d", errno); IDXD_PMD_ERR("%s(): error reading file '%s': %s", - __func__, sysfs_node, strerror(errno)); + __func__, sysfs_node, errmsg); ret = -1; } @@ -191,6 +202,7 @@ static int read_device_int(struct rte_dsa_device *dev, const char *filename, int *value) { + char errmsg[RTE_STRERR_BUFSIZE]; char sysfs_node[PATH_MAX]; FILE *f; int ret = 0; @@ -199,14 +211,18 @@ read_device_int(struct rte_dsa_device *dev, const char *filename, dsa_get_sysfs_path(), dev->addr.device_id, filename); f = fopen(sysfs_node, "r"); if (f == NULL) { + if (strerror_r(errno, errmsg, sizeof(errmsg)) != 0) + snprintf(errmsg, sizeof(errmsg), "Unknown error %d", errno); IDXD_PMD_ERR("%s(): opening file '%s' failed: %s", - __func__, sysfs_node, strerror(errno)); + __func__, sysfs_node, errmsg); return -1; } if (fscanf(f, "%d", value) != 1) { + if (strerror_r(errno, errmsg, sizeof(errmsg)) != 0) + snprintf(errmsg, sizeof(errmsg), "Unknown error %d", errno); IDXD_PMD_ERR("%s(): error reading file '%s': %s", - __func__, sysfs_node, strerror(errno)); + __func__, sysfs_node, errmsg); ret = -1; } @@ -315,6 +331,7 @@ static int dsa_scan(void) { const char *path = dsa_get_dev_path(); + char errmsg[RTE_STRERR_BUFSIZE]; struct dirent *wq; DIR *dev_dir; @@ -322,8 +339,10 @@ dsa_scan(void) if (dev_dir == NULL) { if (errno == ENOENT) return 0; /* no bus, return without error */ + if (strerror_r(errno, errmsg, sizeof(errmsg)) != 0) + snprintf(errmsg, sizeof(errmsg), "Unknown error %d", errno); IDXD_PMD_ERR("%s(): opendir '%s' failed: %s", - __func__, path, strerror(errno)); + __func__, path, errmsg); return -1; } -- 2.33.0