From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 25637C544 for ; Thu, 23 Jun 2016 16:38:11 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 23 Jun 2016 07:36:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,517,1459839600"; d="scan'208";a="993691007" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga001.fm.intel.com with ESMTP; 23 Jun 2016 07:36:42 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u5NEafS4016329; Thu, 23 Jun 2016 15:36:41 +0100 Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id u5NEafV5026773; Thu, 23 Jun 2016 15:36:41 +0100 Received: (from reshmapa@localhost) by sivswdev02.ir.intel.com with id u5NEafiN026769; Thu, 23 Jun 2016 15:36:41 +0100 From: Reshma Pattan To: dev@dpdk.org Cc: Reshma Pattan Date: Thu, 23 Jun 2016 15:36:37 +0100 Message-Id: <1466692599-26716-3-git-send-email-reshma.pattan@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1466692599-26716-1-git-send-email-reshma.pattan@intel.com> References: <1466604475-11864-1-git-send-email-reshma.pattan@intel.com> <1466692599-26716-1-git-send-email-reshma.pattan@intel.com> Subject: [dpdk-dev] [PATCH v3 2/4] pdump: check getenv return value X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2016 14:38:11 -0000 inside pdump_get_socket_path(), getenv can return a NULL pointer if the match for SOCKET_PATH_HOME is not found in the environment. NULL check is added to return -1 immediately. Since pdump_get_socket_path() returns -1 now, wherever this function is called there the return value is checked and error message is logged. Coverity issue 127344: return value check Coverity issue 127347: null pointer dereference Fixes: 278f945402c5 ("pdump: add new library for packet capture") Signed-off-by: Reshma Pattan --- lib/librte_pdump/rte_pdump.c | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/lib/librte_pdump/rte_pdump.c b/lib/librte_pdump/rte_pdump.c index 5c335ba..8240387 100644 --- a/lib/librte_pdump/rte_pdump.c +++ b/lib/librte_pdump/rte_pdump.c @@ -442,7 +442,7 @@ 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) { char dir[PATH_MAX] = {0}; @@ -455,9 +455,17 @@ pdump_get_socket_path(char *buffer, int bufsz, enum rte_pdump_socktype type) else { 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; + } strcat(dir, dir_home); } else strcat(dir, SOCKET_PATH_VAR_RUN); + strcat(dir, SOCKET_DIR); } @@ -467,6 +475,8 @@ pdump_get_socket_path(char *buffer, int bufsz, enum rte_pdump_socktype type) else snprintf(buffer, bufsz, CLIENT_SOCKET, dir, getpid(), rte_sys_gettid()); + + return 0; } static int @@ -476,8 +486,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 */ @@ -608,8 +624,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, @@ -643,8 +665,14 @@ pdump_create_client_socket(struct pdump_request *p) return ret; } - 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__); + return -1; + } addr.sun_family = AF_UNIX; addr_len = sizeof(struct sockaddr_un); @@ -660,9 +688,15 @@ pdump_create_client_socket(struct pdump_request *p) 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__); + break; + } serv_addr.sun_family = AF_UNIX; n = sendto(socket_fd, p, sizeof(struct pdump_request), 0, -- 2.5.0