pdump: fix created directory permissions

[dpdk.git] / lib / librte_pdump / rte_pdump.c

diff --git a/lib/librte_pdump/rte_pdump.c b/lib/librte_pdump/rte_pdump.c
index c921f51..ea5ccd9 100644 (file)
--- a/lib/librte_pdump/rte_pdump.c
+++ b/lib/librte_pdump/rte_pdump.c
@@ -50,8 +50,10 @@
 
 #include "rte_pdump.h"
 
-#define SOCKET_PATH_VAR_RUN "/var/run/pdump_sockets"
-#define SOCKET_PATH_HOME "HOME/pdump_sockets"
+#define SOCKET_PATH_VAR_RUN "/var/run"
+#define SOCKET_PATH_HOME "HOME"
+#define DPDK_DIR         "/.dpdk"
+#define SOCKET_DIR       "/pdump_sockets"
 #define SERVER_SOCKET "%s/pdump_server_socket"
 #define CLIENT_SOCKET "%s/pdump_client_socket_%d_%u"
 #define DEVICE_ID_SIZE 64
@@ -441,28 +443,56 @@ set_pdump_rxtx_cbs(struct pdump_request *p)
 }
 
 /* get socket path (/var/run if root, $HOME otherwise) */
-static void
+static int
 pdump_get_socket_path(char *buffer, int bufsz, enum rte_pdump_socktype type)
 {
-       const char *dir = NULL;
+       char dpdk_dir[PATH_MAX] = {0};
+       char dir[PATH_MAX] = {0};
+       char *dir_home = NULL;
+       int ret = 0;
 
        if (type == RTE_PDUMP_SOCKET_SERVER && server_socket_dir[0] != 0)
-               dir = server_socket_dir;
+               snprintf(dir, sizeof(dir), "%s", server_socket_dir);
        else if (type == RTE_PDUMP_SOCKET_CLIENT && client_socket_dir[0] != 0)
-               dir = client_socket_dir;
+               snprintf(dir, sizeof(dir), "%s", client_socket_dir);
        else {
-               if (getuid() != 0)
-                       dir = getenv(SOCKET_PATH_HOME);
-               else
-                       dir = SOCKET_PATH_VAR_RUN;
+               if (getuid() != 0) {
+                       dir_home = getenv(SOCKET_PATH_HOME);
+                       if (!dir_home) {
+                               RTE_LOG(ERR, PDUMP,
+                                       "Failed to get environment variable"
+                                       " value for %s, %s:%d\n",
+                                       SOCKET_PATH_HOME, __func__, __LINE__);
+                               return -1;
+                       }
+                       snprintf(dpdk_dir, sizeof(dpdk_dir), "%s%s",
+                                       dir_home, DPDK_DIR);
+               } else
+                       snprintf(dpdk_dir, sizeof(dpdk_dir), "%s%s",
+                                       SOCKET_PATH_VAR_RUN, DPDK_DIR);
+
+               mkdir(dpdk_dir, 0700);
+               snprintf(dir, sizeof(dir), "%s%s",
+                                       dpdk_dir, SOCKET_DIR);
+       }
+
+       ret =  mkdir(dir, 0700);
+       /* if user passed socket path is invalid, return immediately */
+       if (ret < 0 && errno != EEXIST) {
+               RTE_LOG(ERR, PDUMP,
+                       "Failed to create dir:%s:%s\n", dir,
+                       strerror(errno));
+               rte_errno = errno;
+               return -1;
        }
 
-       mkdir(dir, 700);
        if (type == RTE_PDUMP_SOCKET_SERVER)
                snprintf(buffer, bufsz, SERVER_SOCKET, dir);
        else
                snprintf(buffer, bufsz, CLIENT_SOCKET, dir, getpid(),
                                rte_sys_gettid());
+
+       return 0;
 }
 
 static int
@@ -472,8 +502,14 @@ pdump_create_server_socket(void)
        struct sockaddr_un addr;
        socklen_t addr_len;
 
-       pdump_get_socket_path(addr.sun_path, sizeof(addr.sun_path),
+       ret = pdump_get_socket_path(addr.sun_path, sizeof(addr.sun_path),
                                RTE_PDUMP_SOCKET_SERVER);
+       if (ret != 0) {
+               RTE_LOG(ERR, PDUMP,
+                       "Failed to get server socket path: %s:%d\n",
+                       __func__, __LINE__);
+               return -1;
+       }
        addr.sun_family = AF_UNIX;
 
        /* remove if file already exists */
@@ -604,8 +640,14 @@ rte_pdump_uninit(void)
 
        struct sockaddr_un addr;
 
-       pdump_get_socket_path(addr.sun_path, sizeof(addr.sun_path),
+       ret = pdump_get_socket_path(addr.sun_path, sizeof(addr.sun_path),
                                RTE_PDUMP_SOCKET_SERVER);
+       if (ret != 0) {
+               RTE_LOG(ERR, PDUMP,
+                       "Failed to get server socket path: %s:%d\n",
+                       __func__, __LINE__);
+               return -1;
+       }
        ret = unlink(addr.sun_path);
        if (ret != 0) {
                RTE_LOG(ERR, PDUMP,
@@ -635,12 +677,19 @@ pdump_create_client_socket(struct pdump_request *p)
                        "client socket(): %s:pid(%d):tid(%u), %s:%d\n",
                        strerror(errno), pid, rte_sys_gettid(),
                        __func__, __LINE__);
-               ret = errno;
-               return ret;
+               rte_errno = errno;
+               return -1;
        }
 
-       pdump_get_socket_path(addr.sun_path, sizeof(addr.sun_path),
+       ret = pdump_get_socket_path(addr.sun_path, sizeof(addr.sun_path),
                                RTE_PDUMP_SOCKET_CLIENT);
+       if (ret != 0) {
+               RTE_LOG(ERR, PDUMP,
+                       "Failed to get client socket path: %s:%d\n",
+                       __func__, __LINE__);
+               rte_errno = errno;
+               goto exit;
+       }
        addr.sun_family = AF_UNIX;
        addr_len = sizeof(struct sockaddr_un);
 
@@ -650,15 +699,22 @@ pdump_create_client_socket(struct pdump_request *p)
                        RTE_LOG(ERR, PDUMP,
                                "client bind(): %s, %s:%d\n",
                                strerror(errno), __func__, __LINE__);
-                       ret = errno;
+                       rte_errno = errno;
                        break;
                }
 
                serv_len = sizeof(struct sockaddr_un);
                memset(&serv_addr, 0, sizeof(serv_addr));
-               pdump_get_socket_path(serv_addr.sun_path,
+               ret = pdump_get_socket_path(serv_addr.sun_path,
                                        sizeof(serv_addr.sun_path),
                                        RTE_PDUMP_SOCKET_SERVER);
+               if (ret != 0) {
+                       RTE_LOG(ERR, PDUMP,
+                               "Failed to get server socket path: %s:%d\n",
+                               __func__, __LINE__);
+                       rte_errno = errno;
+                       break;
+               }
                serv_addr.sun_family = AF_UNIX;
 
                n =  sendto(socket_fd, p, sizeof(struct pdump_request), 0,
@@ -667,7 +723,8 @@ pdump_create_client_socket(struct pdump_request *p)
                        RTE_LOG(ERR, PDUMP,
                                "failed to send to server:%s, %s:%d\n",
                                strerror(errno), __func__, __LINE__);
-                       ret =  errno;
+                       rte_errno = errno;
+                       ret = -1;
                        break;
                }
 
@@ -678,12 +735,14 @@ pdump_create_client_socket(struct pdump_request *p)
                        RTE_LOG(ERR, PDUMP,
                                "failed to recv from server:%s, %s:%d\n",
                                strerror(errno), __func__, __LINE__);
-                       ret = errno;
+                       rte_errno = errno;
+                       ret = -1;
                        break;
                }
                ret = server_resp.err_value;
        } while (0);
 
+exit:
        close(socket_fd);
        unlink(addr.sun_path);
        return ret;
@@ -766,13 +825,15 @@ pdump_prepare_client_request(char *device, uint16_t queue,
        req.flags = flags;
        req.op =  operation;
        if ((operation & ENABLE) != 0) {
-               strncpy(req.data.en_v1.device, device, strlen(device));
+               snprintf(req.data.en_v1.device, sizeof(req.data.en_v1.device),
+                               "%s", device);
                req.data.en_v1.queue = queue;
                req.data.en_v1.ring = ring;
                req.data.en_v1.mp = mp;
                req.data.en_v1.filter = filter;
        } else {
-               strncpy(req.data.dis_v1.device, device, strlen(device));
+               snprintf(req.data.dis_v1.device, sizeof(req.data.dis_v1.device),
+                               "%s", device);
                req.data.dis_v1.queue = queue;
                req.data.dis_v1.ring = NULL;
                req.data.dis_v1.mp = NULL;