New upstream version 18.11.2

[deb_dpdk.git] / lib / librte_eal / common / eal_common_proc.c

diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/common/eal_common_proc.c
index b46d644..852e52e 100644 (file)
--- a/lib/librte_eal/common/eal_common_proc.c
+++ b/lib/librte_eal/common/eal_common_proc.c
@@ -285,7 +285,15 @@ read_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
                        break;
                }
        }
-
+       /* sanity-check the response */
+       if (m->msg.num_fds < 0 || m->msg.num_fds > RTE_MP_MAX_FD_NUM) {
+               RTE_LOG(ERR, EAL, "invalid number of fd's received\n");
+               return -1;
+       }
+       if (m->msg.len_param < 0 || m->msg.len_param > RTE_MP_MAX_PARAM_LEN) {
+               RTE_LOG(ERR, EAL, "invalid received data length\n");
+               return -1;
+       }
        return 0;
 }
 
@@ -678,11 +686,6 @@ send_msg(const char *dst_path, struct rte_mp_msg *msg, int type)
                        unlink(dst_path);
                        return 0;
                }
-               if (errno == ENOBUFS) {
-                       RTE_LOG(ERR, EAL, "Peer cannot receive message %s\n",
-                               dst_path);
-                       return 0;
-               }
                RTE_LOG(ERR, EAL, "failed to send to (%s) due to %s\n",
                        dst_path, strerror(errno));
                return -1;
@@ -758,6 +761,18 @@ check_input(const struct rte_mp_msg *msg)
        if (validate_action_name(msg->name))
                return false;
 
+       if (msg->len_param < 0) {
+               RTE_LOG(ERR, EAL, "Message data length is negative\n");
+               rte_errno = EINVAL;
+               return false;
+       }
+
+       if (msg->num_fds < 0) {
+               RTE_LOG(ERR, EAL, "Number of fd's is negative\n");
+               rte_errno = EINVAL;
+               return false;
+       }
+
        if (msg->len_param > RTE_MP_MAX_PARAM_LEN) {
                RTE_LOG(ERR, EAL, "Message data is too long\n");
                rte_errno = E2BIG;
@@ -919,7 +934,7 @@ int __rte_experimental
 rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
                const struct timespec *ts)
 {
-       int dir_fd, ret = 0;
+       int dir_fd, ret = -1;
        DIR *mp_dir;
        struct dirent *ent;
        struct timeval now;
@@ -927,13 +942,13 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
 
        RTE_LOG(DEBUG, EAL, "request: %s\n", req->name);
 
-       if (check_input(req) == false)
-               return -1;
-
        reply->nb_sent = 0;
        reply->nb_received = 0;
        reply->msgs = NULL;
 
+       if (check_input(req) == false)
+               goto end;
+
        if (internal_config.no_shconf) {
                RTE_LOG(DEBUG, EAL, "No shared files mode enabled, IPC is disabled\n");
                return 0;
@@ -942,7 +957,7 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
        if (gettimeofday(&now, NULL) < 0) {
                RTE_LOG(ERR, EAL, "Failed to get current time\n");
                rte_errno = errno;
-               return -1;
+               goto end;
        }
 
        end.tv_nsec = (now.tv_usec * 1000 + ts->tv_nsec) % 1000000000;
@@ -954,7 +969,7 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
                pthread_mutex_lock(&pending_requests.lock);
                ret = mp_request_sync(eal_mp_socket_path(), req, reply, &end);
                pthread_mutex_unlock(&pending_requests.lock);
-               return ret;
+               goto end;
        }
 
        /* for primary process, broadcast request, and collect reply 1 by 1 */
@@ -962,7 +977,7 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
        if (!mp_dir) {
                RTE_LOG(ERR, EAL, "Unable to open directory %s\n", mp_dir_path);
                rte_errno = errno;
-               return -1;
+               goto end;
        }
 
        dir_fd = dirfd(mp_dir);
@@ -970,9 +985,8 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
        if (flock(dir_fd, LOCK_SH)) {
                RTE_LOG(ERR, EAL, "Unable to lock directory %s\n",
                        mp_dir_path);
-               closedir(mp_dir);
                rte_errno = errno;
-               return -1;
+               goto close_end;
        }
 
        pthread_mutex_lock(&pending_requests.lock);
@@ -989,14 +1003,25 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply,
                 * locks on receive
                 */
                if (mp_request_sync(path, req, reply, &end))
-                       ret = -1;
+                       goto unlock_end;
        }
+       ret = 0;
+
+unlock_end:
        pthread_mutex_unlock(&pending_requests.lock);
        /* unlock the directory */
        flock(dir_fd, LOCK_UN);
 
+close_end:
        /* dir_fd automatically closed on closedir */
        closedir(mp_dir);
+
+end:
+       if (ret) {
+               free(reply->msgs);
+               reply->nb_received = 0;
+               reply->msgs = NULL;
+       }
        return ret;
 }