From patchwork Mon Nov 1 17:53:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harman Kalra X-Patchwork-Id: 103358 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A6A39A0548; Mon, 1 Nov 2021 18:53:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 775F140E28; Mon, 1 Nov 2021 18:53:48 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 019D340DF6 for ; Mon, 1 Nov 2021 18:53:46 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1A1CPxSt000810; Mon, 1 Nov 2021 10:53:46 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=pfpt0220; bh=DlHjCVPiYKLB7TdFgodgiB1iazQg2tv+Va1rb+8Wua4=; b=WKQgvDIGTBwd/xn6SGEY/oiDUGweT8wPUq4ZsDs2V9FGYh/LYV7o2bR52UkU5iynT83y 9jcvSgmezOIr5GITjgwGnqZU0+BUjJZRpHg+IXEhbSUgxb5C9ZamJQCxph+4DOtzcB3n yi+tNVh2bBvJV5AgWYL15Wrr9qv364D7JuXg2w3m0I9dcrYptGvaII2MxT3L83mEx6N/ TJeaeV2edqfpnYOfWf9TWsz6QFJb/gi0wXIppkq7O3MR3UrfKBvQiBf/SfkRxCgjwcqO Q8bGEI2LGU6b1P8DDIMH0JkfCCf5SSTHmdBVSog584YLhrWqIeJbpnYWzM5w2Wip4CVN uw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3c25c4bsbk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 01 Nov 2021 10:53:46 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 1 Nov 2021 10:53:44 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Mon, 1 Nov 2021 10:53:44 -0700 Received: from localhost.marvell.com (unknown [10.29.52.211]) by maili.marvell.com (Postfix) with ESMTP id D62213F70B7; Mon, 1 Nov 2021 10:53:42 -0700 (PDT) From: Harman Kalra To: , Harman Kalra CC: , Date: Mon, 1 Nov 2021 23:23:32 +0530 Message-ID: <20211101175337.83358-1-hkalra@marvell.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: Hn6JF7OM_MDZTE03G-CQQ3SpPpCIgfhs X-Proofpoint-GUID: Hn6JF7OM_MDZTE03G-CQQ3SpPpCIgfhs X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-01_06,2021-11-01_01,2020-04-07_01 Subject: [dpdk-dev] [PATCH 1/6] interrupts: fix argument cannot be negative 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 Sender: "dev" This patch fixes coverity issues by adding a check for negative event fd value. Coverity issue: 373716,373699,373693,373688 Fixes: bbbac4cd6ed2 ("interrupts: remove direct access to interrupt handle") Signed-off-by: Harman Kalra --- lib/eal/linux/eal_interrupts.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c index f72661e1f0..15a27a2abf 100644 --- a/lib/eal/linux/eal_interrupts.c +++ b/lib/eal/linux/eal_interrupts.c @@ -416,7 +416,7 @@ uio_intx_intr_disable(const struct rte_intr_handle *intr_handle) /* use UIO config file descriptor for uio_pci_generic */ uio_cfg_fd = rte_intr_dev_fd_get(intr_handle); - if (pread(uio_cfg_fd, &command_high, 1, 5) != 1) { + if (uio_cfg_fd < 0 || pread(uio_cfg_fd, &command_high, 1, 5) != 1) { RTE_LOG(ERR, EAL, "Error reading interrupts status for fd %d\n", uio_cfg_fd); @@ -442,7 +442,7 @@ uio_intx_intr_enable(const struct rte_intr_handle *intr_handle) /* use UIO config file descriptor for uio_pci_generic */ uio_cfg_fd = rte_intr_dev_fd_get(intr_handle); - if (pread(uio_cfg_fd, &command_high, 1, 5) != 1) { + if (uio_cfg_fd < 0 || pread(uio_cfg_fd, &command_high, 1, 5) != 1) { RTE_LOG(ERR, EAL, "Error reading interrupts status for fd %d\n", uio_cfg_fd); @@ -465,7 +465,8 @@ uio_intr_disable(const struct rte_intr_handle *intr_handle) { const int value = 0; - if (write(rte_intr_fd_get(intr_handle), &value, sizeof(value)) < 0) { + if (rte_intr_fd_get(intr_handle) < 0 || + write(rte_intr_fd_get(intr_handle), &value, sizeof(value)) < 0) { RTE_LOG(ERR, EAL, "Error disabling interrupts for fd %d (%s)\n", rte_intr_fd_get(intr_handle), strerror(errno)); return -1; @@ -478,7 +479,8 @@ uio_intr_enable(const struct rte_intr_handle *intr_handle) { const int value = 1; - if (write(rte_intr_fd_get(intr_handle), &value, sizeof(value)) < 0) { + if (rte_intr_fd_get(intr_handle) < 0 || + write(rte_intr_fd_get(intr_handle), &value, sizeof(value)) < 0) { RTE_LOG(ERR, EAL, "Error enabling interrupts for fd %d (%s)\n", rte_intr_fd_get(intr_handle), strerror(errno)); return -1; From patchwork Mon Nov 1 17:53:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harman Kalra X-Patchwork-Id: 103359 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 781FCA0548; Mon, 1 Nov 2021 18:53:59 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6879F410E6; Mon, 1 Nov 2021 18:53:59 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 77C7840DF6 for ; Mon, 1 Nov 2021 18:53:57 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1A1HJ72W008746; Mon, 1 Nov 2021 10:53:57 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=05Gr7EUT1321WE+6rm1LFXpNWiR7Q3uYI9MC7ZRwjHQ=; b=ivGjeMzxjLZV/RBjjKIWuzlwP4Z+PUUJiuaCeHNgof9HlM0X6EWKXIBTHgNjK9PCgB+2 jJm8wtLnETEGmGtPC5CazFeLnPS4BU8wGj19jmWxO6C4kDfwls0LmsatSNiDFgm0rw5t N6iWmObLgs9O1HqY/Svm2P6nQ6/f2OQCnhs3G2p7+DW1s6NhSYCNxcnen5mvFO2OD418 7P0dDyXmyFuqo4aZD9ZSombzLhKHaLLH16aKnldZV98ib6lvIqnjfbkc8Lfo9oarBdx8 WIupGesU4DYTPMBanfQbn8eJO01x4rV3AcJoQljyWpnGM8c+WH3TrVBjme3hKWK7PZw7 gA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3c25c4bsc2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 01 Nov 2021 10:53:56 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 1 Nov 2021 10:53:54 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Mon, 1 Nov 2021 10:53:54 -0700 Received: from localhost.marvell.com (unknown [10.29.52.211]) by maili.marvell.com (Postfix) with ESMTP id 6E2E73F70B3; Mon, 1 Nov 2021 10:53:53 -0700 (PDT) From: Harman Kalra To: CC: , , Harman Kalra Date: Mon, 1 Nov 2021 23:23:33 +0530 Message-ID: <20211101175337.83358-2-hkalra@marvell.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20211101175337.83358-1-hkalra@marvell.com> References: <20211101175337.83358-1-hkalra@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: Oi0DUtNS9jhbHcnedC6zoSo3Cr_iyvOB X-Proofpoint-GUID: Oi0DUtNS9jhbHcnedC6zoSo3Cr_iyvOB X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-01_06,2021-11-01_01,2020-04-07_01 Subject: [dpdk-dev] [PATCH 2/6] lib: fix argument cannot be negative 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 Sender: "dev" This patch fixes coverity issue by adding a check for negative event fd value. Coverity issue: 373711,373694 Fixes: c2bd9367e18f ("lib: remove direct access to interrupt handle") Signed-off-by: Harman Kalra --- lib/eal/linux/eal_dev.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/eal/linux/eal_dev.c b/lib/eal/linux/eal_dev.c index 06820a3666..607f18ebc2 100644 --- a/lib/eal/linux/eal_dev.c +++ b/lib/eal/linux/eal_dev.c @@ -217,8 +217,10 @@ static void dev_delayed_unregister(void *param) { rte_intr_callback_unregister(intr_handle, dev_uev_handler, param); - close(rte_intr_fd_get(intr_handle)); - rte_intr_fd_set(intr_handle, -1); + if (rte_intr_fd_get(intr_handle) >= 0) { + close(rte_intr_fd_get(intr_handle)); + rte_intr_fd_set(intr_handle, -1); + } } static void @@ -234,6 +236,9 @@ dev_uev_handler(__rte_unused void *param) memset(&uevent, 0, sizeof(struct rte_dev_event)); memset(buf, 0, EAL_UEV_MSG_LEN); + if (rte_intr_fd_get(intr_handle) < 0) + return; + ret = recv(rte_intr_fd_get(intr_handle), buf, EAL_UEV_MSG_LEN, MSG_DONTWAIT); if (ret < 0 && errno == EAGAIN) From patchwork Mon Nov 1 17:53:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harman Kalra X-Patchwork-Id: 103360 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 88B6AA0548; Mon, 1 Nov 2021 18:54:06 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 751B7410FB; Mon, 1 Nov 2021 18:54:06 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 3446940DF6 for ; Mon, 1 Nov 2021 18:54:05 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1A1CKSAF001065; Mon, 1 Nov 2021 10:54:04 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=VVhLpch5kLSZ8s0NIh7LJxi570fNNlHulqy5UAtBrck=; b=Isnz7EmATGgLRpdakNVd+goqn+lmnsjPri6UpTWYhDGS+ed0sE0EMNlyA00zUwDRs8bw xZnn48TLNa8cQ9Qx4EfV54mNiwaF7478o8ekmC7xzwQYKakE0qKi4GWICewyajaQJXum D2JUO7dwn/dzw4oCkURbAZDKiEbS0IFRPr0xxMwDP/xQ8OfH0P3446Ap4q/ovmaFMK4s cMF6Nw7RfDp+suZymjHTVzbbFYPMC5ZgEtj6LR6S3BvDQY2j7P0PShtxLk2VtXoS2N8B jmaZjCGJKjY52tkfH+MOtbk9GTyShz0xOvV/dZEEUgm7Ob8zVvfPTbU4qFR9xqNP4Cax cQ== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3c25c4bscm-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 01 Nov 2021 10:54:04 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 1 Nov 2021 10:54:02 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Mon, 1 Nov 2021 10:54:02 -0700 Received: from localhost.marvell.com (unknown [10.29.52.211]) by maili.marvell.com (Postfix) with ESMTP id 296BF3F70B3; Mon, 1 Nov 2021 10:54:00 -0700 (PDT) From: Harman Kalra To: , Haiyue Wang CC: , , Harman Kalra Date: Mon, 1 Nov 2021 23:23:34 +0530 Message-ID: <20211101175337.83358-3-hkalra@marvell.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20211101175337.83358-1-hkalra@marvell.com> References: <20211101175337.83358-1-hkalra@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: h9ag4avFpGL_76qnl4Bs0mAo_5SLp5UG X-Proofpoint-GUID: h9ag4avFpGL_76qnl4Bs0mAo_5SLp5UG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-01_06,2021-11-01_01,2020-04-07_01 Subject: [dpdk-dev] [PATCH 3/6] drivers: fix bad bit shift operation 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 Sender: "dev" This patch fixes coverity issue by adding a check for negative value to avoid bad bit shift operation. Coverity issue: 373717,373697,373685 Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle") Signed-off-by: Harman Kalra Acked-by: Haiyue Wang --- drivers/net/e1000/igb_ethdev.c | 17 +++++++++++------ drivers/net/igc/igc_ethdev.c | 18 +++++++++++++----- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index ff06575f03..031a880b6a 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -5194,7 +5194,7 @@ eth_igb_assign_msix_vector(struct e1000_hw *hw, int8_t direction, static void eth_igb_configure_msix_intr(struct rte_eth_dev *dev) { - int queue_id; + int queue_id, nb_efd; uint32_t tmpval, regval, intr_mask; struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); @@ -5243,9 +5243,11 @@ eth_igb_configure_msix_intr(struct rte_eth_dev *dev) E1000_WRITE_REG(hw, E1000_GPIE, E1000_GPIE_MSIX_MODE | E1000_GPIE_PBA | E1000_GPIE_EIAME | E1000_GPIE_NSICR); - intr_mask = - RTE_LEN2MASK(rte_intr_nb_efd_get(intr_handle), - uint32_t) << misc_shift; + nb_efd = rte_intr_nb_efd_get(intr_handle); + if (nb_efd < 0) + return; + + intr_mask = RTE_LEN2MASK(nb_efd, uint32_t) << misc_shift; if (dev->data->dev_conf.intr_conf.lsc != 0) intr_mask |= (1 << IGB_MSIX_OTHER_INTR_VEC); @@ -5263,8 +5265,11 @@ eth_igb_configure_msix_intr(struct rte_eth_dev *dev) /* use EIAM to auto-mask when MSI-X interrupt * is asserted, this saves a register write for every interrupt */ - intr_mask = RTE_LEN2MASK(rte_intr_nb_efd_get(intr_handle), - uint32_t) << misc_shift; + nb_efd = rte_intr_nb_efd_get(intr_handle); + if (nb_efd < 0) + return; + + intr_mask = RTE_LEN2MASK(nb_efd, uint32_t) << misc_shift; if (dev->data->dev_conf.intr_conf.lsc != 0) intr_mask |= (1 << IGB_MSIX_OTHER_INTR_VEC); diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c index 8189ad412a..6652c3c806 100644 --- a/drivers/net/igc/igc_ethdev.c +++ b/drivers/net/igc/igc_ethdev.c @@ -727,7 +727,7 @@ igc_configure_msix_intr(struct rte_eth_dev *dev) uint32_t vec = IGC_MISC_VEC_ID; uint32_t base = IGC_MISC_VEC_ID; uint32_t misc_shift = 0; - int i; + int i, nb_efd; /* won't configure msix register if no mapping is done * between intr vector and event fd @@ -745,8 +745,12 @@ igc_configure_msix_intr(struct rte_eth_dev *dev) IGC_WRITE_REG(hw, IGC_GPIE, IGC_GPIE_MSIX_MODE | IGC_GPIE_PBA | IGC_GPIE_EIAME | IGC_GPIE_NSICR); - intr_mask = RTE_LEN2MASK(rte_intr_nb_efd_get(intr_handle), - uint32_t) << misc_shift; + + nb_efd = rte_intr_nb_efd_get(intr_handle); + if (nb_efd < 0) + return; + + intr_mask = RTE_LEN2MASK(nb_efd, uint32_t) << misc_shift; if (dev->data->dev_conf.intr_conf.lsc) intr_mask |= (1u << IGC_MSIX_OTHER_INTR_VEC); @@ -802,6 +806,7 @@ igc_rxq_interrupt_setup(struct rte_eth_dev *dev) struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_intr_handle *intr_handle = pci_dev->intr_handle; int misc_shift = rte_intr_allow_others(intr_handle) ? 1 : 0; + int nb_efd; /* won't configure msix register if no mapping is done * between intr vector and event fd @@ -809,8 +814,11 @@ igc_rxq_interrupt_setup(struct rte_eth_dev *dev) if (!rte_intr_dp_is_en(intr_handle)) return; - mask = RTE_LEN2MASK(rte_intr_nb_efd_get(intr_handle), uint32_t) - << misc_shift; + nb_efd = rte_intr_nb_efd_get(intr_handle); + if (nb_efd < 0) + return; + + mask = RTE_LEN2MASK(nb_efd, uint32_t) << misc_shift; IGC_WRITE_REG(hw, IGC_EIMS, mask); } From patchwork Mon Nov 1 17:53:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harman Kalra X-Patchwork-Id: 103361 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9413CA0548; Mon, 1 Nov 2021 18:54:19 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8337A410E8; Mon, 1 Nov 2021 18:54:19 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id CFECA40DF6 for ; Mon, 1 Nov 2021 18:54:17 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1A1AY4FX010134; Mon, 1 Nov 2021 10:54:16 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=S56iaZR7ckUIv6kP9T1SXcN0Es71bDXgDPnGnGJ+g1g=; b=ePgefjEINri0T/cO7Rmjl+9I7BUZFoEbNjRkmP9W1OzcGByQEVLgIO9OwoyOOVpyjoAH 3Q8QQOsr84c2MAGBM4Oh22iGgHSXSeTffJxkaLTXhDGS/fuIP95o+jy5LdTIFsuqdF7t Ol0veA+aT2oLRA341W+NFg3zCDVzRB/o2BK3s11CgA2qCkprgrWbXteOlOPHx4hgQfpy IRl6RANS1UL6kZf/Zd8UMje3wbl2O6RdGJybMAahU2Ra2pURje/irbA4W5ilJiLGzwWO ug74NsDKBQgbKAGl5lj//vVF/J+p4k8fL1qDXjFJKyLFrVpBL9XnxDY5W4PIudlVhqEz Dw== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3c2ekn1yfn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 01 Nov 2021 10:54:16 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 1 Nov 2021 10:54:14 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Mon, 1 Nov 2021 10:54:14 -0700 Received: from localhost.marvell.com (unknown [10.29.52.211]) by maili.marvell.com (Postfix) with ESMTP id F1CEF3F70B3; Mon, 1 Nov 2021 10:54:09 -0700 (PDT) From: Harman Kalra To: , Ferruh Yigit , Anatoly Burakov , Stephen Hemminger , "Long Li" , Hemant Agrawal , "Sachin Saxena" , Jakub Grajciar , Matan Azrad , Viacheslav Ovsiienko CC: , , Harman Kalra Date: Mon, 1 Nov 2021 23:23:35 +0530 Message-ID: <20211101175337.83358-4-hkalra@marvell.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20211101175337.83358-1-hkalra@marvell.com> References: <20211101175337.83358-1-hkalra@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: iLLN4HiEqpHBjtkCIXesMSsjjb9Lt8JB X-Proofpoint-ORIG-GUID: iLLN4HiEqpHBjtkCIXesMSsjjb9Lt8JB X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-01_06,2021-11-01_01,2020-04-07_01 Subject: [dpdk-dev] [PATCH 4/6] drivers: fix argument cannot be negative 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 Sender: "dev" This patch fixes coverity issue by adding a check for negative event fd value. Coverity issue: 373723,373720,373719,373718,373715,373714,373713,373710, 373707,373706,373705,373704,373701,373700,373698,373695, 373692,373690,373689 Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle") Signed-off-by: Harman Kalra --- drivers/bus/pci/linux/pci_uio.c | 6 ++++++ drivers/bus/pci/linux/pci_vfio.c | 15 +++++++++++++++ drivers/bus/pci/pci_common_uio.c | 3 ++- drivers/bus/vmbus/linux/vmbus_uio.c | 6 +++++- drivers/bus/vmbus/vmbus_common_uio.c | 4 +++- drivers/net/dpaa/dpaa_ethdev.c | 3 +++ drivers/net/memif/memif_socket.c | 6 +++++- drivers/net/memif/rte_eth_memif.c | 12 +++++++++--- drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 3 +++ 9 files changed, 51 insertions(+), 7 deletions(-) diff --git a/drivers/bus/pci/linux/pci_uio.c b/drivers/bus/pci/linux/pci_uio.c index 2ee5d04672..d52125e49b 100644 --- a/drivers/bus/pci/linux/pci_uio.c +++ b/drivers/bus/pci/linux/pci_uio.c @@ -37,6 +37,9 @@ pci_uio_read_config(const struct rte_intr_handle *intr_handle, { int uio_cfg_fd = rte_intr_dev_fd_get(intr_handle); + if (uio_cfg_fd < 0) + return -1; + return pread(uio_cfg_fd, buf, len, offset); } @@ -46,6 +49,9 @@ pci_uio_write_config(const struct rte_intr_handle *intr_handle, { int uio_cfg_fd = rte_intr_dev_fd_get(intr_handle); + if (uio_cfg_fd < 0) + return -1; + return pwrite(uio_cfg_fd, buf, len, offset); } diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index edcee92556..779525aa3e 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -49,6 +49,9 @@ pci_vfio_read_config(const struct rte_intr_handle *intr_handle, { int vfio_dev_fd = rte_intr_dev_fd_get(intr_handle); + if (vfio_dev_fd < 0) + return -1; + return pread64(vfio_dev_fd, buf, len, VFIO_GET_REGION_ADDR(VFIO_PCI_CONFIG_REGION_INDEX) + offs); } @@ -59,6 +62,9 @@ pci_vfio_write_config(const struct rte_intr_handle *intr_handle, { int vfio_dev_fd = rte_intr_dev_fd_get(intr_handle); + if (vfio_dev_fd < 0) + return -1; + return pwrite64(vfio_dev_fd, buf, len, VFIO_GET_REGION_ADDR(VFIO_PCI_CONFIG_REGION_INDEX) + offs); } @@ -1012,6 +1018,9 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev) } #endif + if (rte_intr_fd_get(dev->intr_handle) < 0) + return -1; + if (close(rte_intr_fd_get(dev->intr_handle)) < 0) { RTE_LOG(INFO, EAL, "Error when closing eventfd file descriptor for %s\n", pci_addr); @@ -1114,6 +1123,9 @@ pci_vfio_ioport_read(struct rte_pci_ioport *p, const struct rte_intr_handle *intr_handle = p->dev->intr_handle; int vfio_dev_fd = rte_intr_dev_fd_get(intr_handle); + if (vfio_dev_fd < 0) + return; + if (pread64(vfio_dev_fd, data, len, p->base + offset) <= 0) RTE_LOG(ERR, EAL, @@ -1128,6 +1140,9 @@ pci_vfio_ioport_write(struct rte_pci_ioport *p, const struct rte_intr_handle *intr_handle = p->dev->intr_handle; int vfio_dev_fd = rte_intr_dev_fd_get(intr_handle); + if (vfio_dev_fd < 0) + return; + if (pwrite64(vfio_dev_fd, data, len, p->base + offset) <= 0) RTE_LOG(ERR, EAL, diff --git a/drivers/bus/pci/pci_common_uio.c b/drivers/bus/pci/pci_common_uio.c index 244c9a8940..76c661f054 100644 --- a/drivers/bus/pci/pci_common_uio.c +++ b/drivers/bus/pci/pci_common_uio.c @@ -233,7 +233,8 @@ pci_uio_unmap_resource(struct rte_pci_device *dev) rte_free(uio_res); /* close fd if in primary process */ - close(rte_intr_fd_get(dev->intr_handle)); + if (rte_intr_fd_get(dev->intr_handle) >= 0) + close(rte_intr_fd_get(dev->intr_handle)); uio_cfg_fd = rte_intr_dev_fd_get(dev->intr_handle); if (uio_cfg_fd >= 0) { close(uio_cfg_fd); diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c index 9c5c1aeca3..5db70f8e0d 100644 --- a/drivers/bus/vmbus/linux/vmbus_uio.c +++ b/drivers/bus/vmbus/linux/vmbus_uio.c @@ -30,7 +30,8 @@ static void *vmbus_map_addr; /* Control interrupts */ void vmbus_uio_irq_control(struct rte_vmbus_device *dev, int32_t onoff) { - if (write(rte_intr_fd_get(dev->intr_handle), &onoff, + if ((rte_intr_fd_get(dev->intr_handle) < 0) || + write(rte_intr_fd_get(dev->intr_handle), &onoff, sizeof(onoff)) < 0) { VMBUS_LOG(ERR, "cannot write to %d:%s", rte_intr_fd_get(dev->intr_handle), @@ -43,6 +44,9 @@ int vmbus_uio_irq_read(struct rte_vmbus_device *dev) int32_t count; int cc; + if (rte_intr_fd_get(dev->intr_handle) < 0) + return -1; + cc = read(rte_intr_fd_get(dev->intr_handle), &count, sizeof(count)); if (cc < (int)sizeof(count)) { diff --git a/drivers/bus/vmbus/vmbus_common_uio.c b/drivers/bus/vmbus/vmbus_common_uio.c index 336296d6a8..882a24f869 100644 --- a/drivers/bus/vmbus/vmbus_common_uio.c +++ b/drivers/bus/vmbus/vmbus_common_uio.c @@ -258,7 +258,9 @@ vmbus_uio_unmap_resource(struct rte_vmbus_device *dev) rte_free(uio_res); /* close fd if in primary process */ - close(rte_intr_fd_get(dev->intr_handle)); + if (rte_intr_fd_get(dev->intr_handle) >= 0) + close(rte_intr_fd_get(dev->intr_handle)); + if (rte_intr_dev_fd_get(dev->intr_handle) >= 0) { close(rte_intr_dev_fd_get(dev->intr_handle)); rte_intr_dev_fd_set(dev->intr_handle, -1); diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index b9bf9d2966..e49f765434 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -371,6 +371,9 @@ static void dpaa_interrupt_handler(void *param) dpaa_dev = container_of(rdev, struct rte_dpaa_device, device); intr_handle = dpaa_dev->intr_handle; + if (rte_intr_fd_get(intr_handle) < 0) + return; + bytes_read = read(rte_intr_fd_get(intr_handle), &buf, sizeof(uint64_t)); if (bytes_read < 0) diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c index d48c3685d9..c845c20ccf 100644 --- a/drivers/net/memif/memif_socket.c +++ b/drivers/net/memif/memif_socket.c @@ -508,7 +508,8 @@ memif_intr_unregister_handler(struct rte_intr_handle *intr_handle, void *arg) struct memif_control_channel *cc = arg; /* close control channel fd */ - close(rte_intr_fd_get(intr_handle)); + if (rte_intr_fd_get(intr_handle) >= 0) + close(rte_intr_fd_get(intr_handle)); /* clear message queue */ while ((elt = TAILQ_FIRST(&cc->msg_queue)) != NULL) { TAILQ_REMOVE(&cc->msg_queue, elt, next); @@ -651,6 +652,9 @@ memif_msg_receive(struct memif_control_channel *cc) mh.msg_control = ctl; mh.msg_controllen = sizeof(ctl); + if (rte_intr_fd_get(cc->intr_handle) < 0) + return -1; + size = recvmsg(rte_intr_fd_get(cc->intr_handle), &mh, 0); if (size != sizeof(memif_msg_t)) { MIF_LOG(DEBUG, "Invalid message size = %zd", size); diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c index 8cec493ffd..2935ae6ebe 100644 --- a/drivers/net/memif/rte_eth_memif.c +++ b/drivers/net/memif/rte_eth_memif.c @@ -325,7 +325,8 @@ eth_memif_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) } /* consume interrupt */ - if ((ring->flags & MEMIF_RING_FLAG_MASK_INT) == 0) + if (((ring->flags & MEMIF_RING_FLAG_MASK_INT) == 0) && + (rte_intr_fd_get(mq->intr_handle) >= 0)) size = read(rte_intr_fd_get(mq->intr_handle), &b, sizeof(b)); @@ -460,7 +461,8 @@ eth_memif_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) } /* consume interrupt */ - if ((ring->flags & MEMIF_RING_FLAG_MASK_INT) == 0) { + if ((rte_intr_fd_get(mq->intr_handle) >= 0) && + ((ring->flags & MEMIF_RING_FLAG_MASK_INT) == 0)) { uint64_t b; ssize_t size __rte_unused; size = read(rte_intr_fd_get(mq->intr_handle), &b, @@ -680,7 +682,8 @@ eth_memif_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) else __atomic_store_n(&ring->tail, slot, __ATOMIC_RELEASE); - if ((ring->flags & MEMIF_RING_FLAG_MASK_INT) == 0) { + if (((ring->flags & MEMIF_RING_FLAG_MASK_INT) == 0) && + (rte_intr_fd_get(mq->intr_handle) >= 0)) { a = 1; size = write(rte_intr_fd_get(mq->intr_handle), &a, sizeof(a)); @@ -835,6 +838,9 @@ eth_memif_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) /* Send interrupt, if enabled. */ if ((ring->flags & MEMIF_RING_FLAG_MASK_INT) == 0) { uint64_t a = 1; + if (rte_intr_fd_get(mq->intr_handle) < 0) + return -1; + ssize_t size = write(rte_intr_fd_get(mq->intr_handle), &a, sizeof(a)); if (unlikely(size < 0)) { diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c index cb37ba097c..db971bad48 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c @@ -24,6 +24,9 @@ mlx5_vdpa_virtq_handler(void *cb_arg) uint64_t buf; int nbytes; + if (rte_intr_fd_get(virtq->intr_handle) < 0) + return; + do { nbytes = read(rte_intr_fd_get(virtq->intr_handle), &buf, 8); From patchwork Mon Nov 1 17:53:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harman Kalra X-Patchwork-Id: 103362 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5EA65A0548; Mon, 1 Nov 2021 18:54:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D81B7410FC; Mon, 1 Nov 2021 18:54:25 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 4B52940DF6 for ; Mon, 1 Nov 2021 18:54:24 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1A1AY2TU010091; Mon, 1 Nov 2021 10:54:22 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=N3HnrPppzdcNlW/QM2teEuBgei1ahuGQmyHnjqgs1BM=; b=BaCvLy/3gzEJoVrrv9BTbp58t3L8VYOQsSxaw7gApCmYxBzqVK9Aj3qj+Bb6OD+EPn9K Tn4bSxunIrafweeZvT7UlyTqQh42G+KtTCoBndJ/JKzR3ObXJ/ZNUgHd7pzFwZQAatUS BWGOG77FIGK4Rcj7pbjVlUFxFE64UC76utxI7IzqNDVj+oyVTIYIhecc835YecR4yPoK TDIAOuYEY4DAke16kh396UIaZej/bp56eHXJk8aOleJAAN/EKNJSepJlSkfc3anAL5s2 pDPq3TjAONtnT1z19rAk1lx2KGtPDZ8yewfDl7MtJ9DoSvAvXh281RUxJUyzvmADTHhv 8w== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3c2ekn1yg0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 01 Nov 2021 10:54:22 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 1 Nov 2021 10:54:20 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Mon, 1 Nov 2021 10:54:20 -0700 Received: from localhost.marvell.com (unknown [10.29.52.211]) by maili.marvell.com (Postfix) with ESMTP id 74B803F70BB; Mon, 1 Nov 2021 10:54:18 -0700 (PDT) From: Harman Kalra To: , Anatoly Burakov , "Jakub Grajciar" , Keith Wiles CC: , , Harman Kalra Date: Mon, 1 Nov 2021 23:23:36 +0530 Message-ID: <20211101175337.83358-5-hkalra@marvell.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20211101175337.83358-1-hkalra@marvell.com> References: <20211101175337.83358-1-hkalra@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: cnIldcPd9upwztEPcwAEFnNlT1zPyj0s X-Proofpoint-ORIG-GUID: cnIldcPd9upwztEPcwAEFnNlT1zPyj0s X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-01_06,2021-11-01_01,2020-04-07_01 Subject: [dpdk-dev] [PATCH 5/6] drivers: fix improper use of negative value 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 Sender: "dev" This patch fixes coverity issue by adding a check for negative event fd value. Coverity issue: 373722,373721,373709,373702,373696 Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle") Signed-off-by: Harman Kalra --- drivers/bus/pci/linux/pci_vfio.c | 6 ++++++ drivers/net/memif/memif_socket.c | 3 +++ drivers/net/tap/rte_eth_tap.c | 11 +++++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index 779525aa3e..1a5e7c2d2a 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -1028,6 +1028,9 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev) } vfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle); + if (vfio_dev_fd < 0) + return -1; + if (pci_vfio_set_bus_master(vfio_dev_fd, false)) { RTE_LOG(ERR, EAL, "%s cannot unset bus mastering for PCI device!\n", pci_addr); @@ -1071,6 +1074,9 @@ pci_vfio_unmap_resource_secondary(struct rte_pci_device *dev) loc->domain, loc->bus, loc->devid, loc->function); vfio_dev_fd = rte_intr_dev_fd_get(dev->intr_handle); + if (vfio_dev_fd < 0) + return -1; + ret = rte_vfio_release_device(rte_pci_get_sysfs_path(), pci_addr, vfio_dev_fd); if (ret < 0) { diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c index c845c20ccf..079cf01269 100644 --- a/drivers/net/memif/memif_socket.c +++ b/drivers/net/memif/memif_socket.c @@ -65,6 +65,9 @@ memif_msg_send_from_queue(struct memif_control_channel *cc) if (e == NULL) return 0; + if (rte_intr_fd_get(cc->intr_handle) < 0) + return -1; + size = memif_msg_send(rte_intr_fd_get(cc->intr_handle), &e->msg, e->fd); if (size != sizeof(memif_msg_t)) { diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index a9a7658147..1b7d34e8a0 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -1663,8 +1663,9 @@ tap_dev_intr_handler(void *cb_arg) struct rte_eth_dev *dev = cb_arg; struct pmd_internals *pmd = dev->data->dev_private; - tap_nl_recv(rte_intr_fd_get(pmd->intr_handle), - tap_nl_msg_handler, dev); + if (rte_intr_fd_get(pmd->intr_handle) >= 0) + tap_nl_recv(rte_intr_fd_get(pmd->intr_handle), + tap_nl_msg_handler, dev); } static int @@ -1703,8 +1704,10 @@ tap_lsc_intr_handle_set(struct rte_eth_dev *dev, int set) } } while (true); - tap_nl_final(rte_intr_fd_get(pmd->intr_handle)); - rte_intr_fd_set(pmd->intr_handle, -1); + if (rte_intr_fd_get(pmd->intr_handle) >= 0) { + tap_nl_final(rte_intr_fd_get(pmd->intr_handle)); + rte_intr_fd_set(pmd->intr_handle, -1); + } return 0; } From patchwork Mon Nov 1 17:53:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harman Kalra X-Patchwork-Id: 103363 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0D14BA0548; Mon, 1 Nov 2021 18:54:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F382140E28; Mon, 1 Nov 2021 18:54:32 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id A60C240DF6 for ; Mon, 1 Nov 2021 18:54:30 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1A1CKSAT001065; Mon, 1 Nov 2021 10:54:30 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=ruJEa8zQpBRI1BRwxMK8Sc8+byAuECcCSI5Y3vH0+x4=; b=Ls4hr5Kui14tawUSkhAErAv5TNgNE7X/3tVOdjaIpH5DkFqjOjDoFdS8spQ0mpbZjyQ1 7QdvVCt1L/cPyV5s0dQRYsfuJq0IB/SgGcntoDDnXY4QlR3fKF43fW7gGICKCEkEPJCJ wuOIjZaBr8PnpU2V15uCTN7Te89c2rXOPku1n7qmQD5hlyw1MYXgPPAi+2w2W78psCz/ 3qCw7/NLQj6s4FSj8Pg9OiZWkaZuFTnimDcyhf9tZArWoHcw3tyo7IZfxkhN61S9bkxl fopuLeBXCPks55/+BA3/ICF5ybhan4s57tFrwrVWa65yu6FnTF4mCVEM2d+bqnYOh1rV 3g== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3c25c4bsfj-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 01 Nov 2021 10:54:30 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 1 Nov 2021 10:54:28 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Mon, 1 Nov 2021 10:54:27 -0700 Received: from localhost.marvell.com (unknown [10.29.52.211]) by maili.marvell.com (Postfix) with ESMTP id DE4713F70B3; Mon, 1 Nov 2021 10:54:25 -0700 (PDT) From: Harman Kalra To: , Matan Azrad , Viacheslav Ovsiienko CC: , , Harman Kalra Date: Mon, 1 Nov 2021 23:23:37 +0530 Message-ID: <20211101175337.83358-6-hkalra@marvell.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20211101175337.83358-1-hkalra@marvell.com> References: <20211101175337.83358-1-hkalra@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: -RMADZznQZsQDBYpuADkQs0SWIPhyU7q X-Proofpoint-GUID: -RMADZznQZsQDBYpuADkQs0SWIPhyU7q X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-01_06,2021-11-01_01,2020-04-07_01 Subject: [dpdk-dev] [PATCH 6/6] net/mlx4: fix dereference after null check 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 Sender: "dev" This patch fixes coverity issue by adding a NULL check Coverity issue: 373687 Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle") Signed-off-by: Harman Kalra Acked-by: Viacheslav Ovsiienko Acked-by: David Marchand --- drivers/net/mlx4/mlx4.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index cccc71f757..3f3c4a7c72 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -1112,7 +1112,8 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) prev_dev = eth_dev; continue; port_error: - rte_intr_instance_free(priv->intr_handle); + if (priv != NULL) + rte_intr_instance_free(priv->intr_handle); rte_free(priv); if (eth_dev != NULL) eth_dev->data->dev_private = NULL;