[PATCH v5 47/52] net/vhost: replace strerror with reentrant version

[Dengdui Huang]

The function strerror() is insecure in a multi-thread environment.
This patch uses strerror_r() to replace it.

Signed-off-by: Dengdui Huang <huangdeng...@huawei.com>
Acked-by: Chengwen Feng <fengcheng...@huawei.com>
Acked-by: Morten Brørup <m...@smartsharesystems.com>
Acked-by: Huisong Li <lihuis...@huawei.com>
---
 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