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 D61A945C76; Mon, 4 Nov 2024 12:16:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2CD45427E9; Mon, 4 Nov 2024 12:11:42 +0100 (CET) Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by mails.dpdk.org (Postfix) with ESMTP id 2462D40E49 for ; Mon, 4 Nov 2024 12:10:48 +0100 (CET) Received: from mail.maildlp.com (unknown [172.19.163.44]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Xhpd00mB2z1jwZT; Mon, 4 Nov 2024 19:09:08 +0800 (CST) Received: from dggpeml500011.china.huawei.com (unknown [7.185.36.84]) by mail.maildlp.com (Postfix) with ESMTPS id 731C51400D2; Mon, 4 Nov 2024 19:10:46 +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:46 +0800 From: Dengdui Huang To: CC: , , , , , , , , , , Subject: [PATCH v5 47/52] net/vhost: replace strerror with reentrant version Date: Mon, 4 Nov 2024 19:10:32 +0800 Message-ID: <20241104111037.3632161-48-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/net/vhost/rte_eth_vhost.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 87c05caccd..d35c13166a 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -550,6 +550,7 @@ find_internal_resource(char *ifname) static void eth_vhost_update_intr(struct rte_eth_dev *eth_dev, uint16_t rxq_idx) { + char errmsg[RTE_STRERR_BUFSIZE]; struct rte_vhost_vring vring; struct vhost_queue *vq; @@ -567,8 +568,10 @@ eth_vhost_update_intr(struct rte_eth_dev *eth_dev, uint16_t rxq_idx) /* Remove previous kickfd from proxy epoll */ if (vq->kickfd >= 0 && vq->kickfd != vring.kickfd) { if (epoll_ctl(vq->ev.data.fd, EPOLL_CTL_DEL, vq->kickfd, &vq->ev) < 0) { + if (strerror_r(errno, errmsg, sizeof(errmsg)) != 0) + snprintf(errmsg, sizeof(errmsg), "Unknown error %d", errno); VHOST_LOG_LINE(DEBUG, "Failed to unregister %d from rxq-%d epoll: %s", - vq->kickfd, rxq_idx, strerror(errno)); + vq->kickfd, rxq_idx, errmsg); } else { VHOST_LOG_LINE(DEBUG, "Unregistered %d from rxq-%d epoll", vq->kickfd, rxq_idx); @@ -579,8 +582,10 @@ eth_vhost_update_intr(struct rte_eth_dev *eth_dev, uint16_t rxq_idx) /* Add new one, if valid */ if (vq->kickfd != vring.kickfd && vring.kickfd >= 0) { if (epoll_ctl(vq->ev.data.fd, EPOLL_CTL_ADD, vring.kickfd, &vq->ev) < 0) { + if (strerror_r(errno, errmsg, sizeof(errmsg)) != 0) + snprintf(errmsg, sizeof(errmsg), "Unknown error %d", errno); VHOST_LOG_LINE(ERR, "Failed to register %d in rxq-%d epoll: %s", - vring.kickfd, rxq_idx, strerror(errno)); + vring.kickfd, rxq_idx, errmsg); } else { vq->kickfd = vring.kickfd; VHOST_LOG_LINE(DEBUG, "Registered %d in rxq-%d epoll", @@ -716,6 +721,7 @@ eth_vhost_configure_intr(struct rte_eth_dev *dev) static void eth_vhost_unconfigure_intr(struct rte_eth_dev *eth_dev) { + char errmsg[RTE_STRERR_BUFSIZE]; struct vhost_queue *vq; int i; @@ -729,9 +735,11 @@ eth_vhost_unconfigure_intr(struct rte_eth_dev *eth_dev) /* Remove previous kickfd from proxy epoll */ if (vq->kickfd >= 0) { + if (strerror_r(errno, errmsg, sizeof(errmsg)) != 0) + snprintf(errmsg, sizeof(errmsg), "Unknown error %d", errno); if (epoll_ctl(vq->ev.data.fd, EPOLL_CTL_DEL, vq->kickfd, &vq->ev) < 0) { VHOST_LOG_LINE(DEBUG, "Failed to unregister %d from rxq-%d epoll: %s", - vq->kickfd, i, strerror(errno)); + vq->kickfd, i, errmsg); } else { VHOST_LOG_LINE(DEBUG, "Unregistered %d from rxq-%d epoll", vq->kickfd, i); -- 2.33.0