From patchwork Sun Jul 3 12:22:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 113655 X-Patchwork-Delegate: thomas@monjalon.net 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 CE3A4A04FD; Sun, 3 Jul 2022 14:22:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8AB7642B6E; Sun, 3 Jul 2022 14:22:16 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 4686342847; Sun, 3 Jul 2022 14:22:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656850933; x=1688386933; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mtyXLv03QV+SmSKkkuYgmc+3WFVIz5FwjG1dkLXuVnk=; b=d7Cxf/K/8jhijDKqgen16LEqKbv0QkiE3kgIifhODiYRbw0m43Gf/MEP g1ViqQ4MLreHY7YMpRO/Ie0J8oGprvdphHs802L14mivUjRnFLbO07Hdw kS/1/zPapCucXQaF8EQnGY4R7h8A4tggecYknuSSKzLiB62sRd9CVmY13 HE3YymP33r68HWuQCM5D/6lSOXRuT8cUuVy+l2NLUWMwpFMboqpR41pvq maak+GSoia4cFloyioGZDcmM2PKdLV7mPc0Go8BSjGYSIY0VtLYFpH6c2 Y8elc1DsKrMyu5trDDstv+v5yWgzemGZgRB2tzGl2zRZblQyUVm89v4tq w==; X-IronPort-AV: E=McAfee;i="6400,9594,10396"; a="262737114" X-IronPort-AV: E=Sophos;i="5.92,241,1650956400"; d="scan'208";a="262737114" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2022 05:22:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,241,1650956400"; d="scan'208";a="618931248" Received: from silpixa00401122.ir.intel.com ([10.237.213.29]) by orsmga008.jf.intel.com with ESMTP; 03 Jul 2022 05:22:11 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, Kevin Laatz , stable@dpdk.org Subject: [PATCH v2 3/3] dma/idxd: fix null pointer dereference during pci remove Date: Sun, 3 Jul 2022 13:22:43 +0100 Message-Id: <20220703122243.929642-4-kevin.laatz@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220703122243.929642-1-kevin.laatz@intel.com> References: <20220408141504.1319913-1-kevin.laatz@intel.com> <20220703122243.929642-1-kevin.laatz@intel.com> MIME-Version: 1.0 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 The 'info' struct was being declared as a NULL pointer. If a NULL pointer is passed to 'rte_dma_info_get', EINVAL is returned and the struct is not populated. This subsequently causes a segfault when dereferencing 'info'. This patch fixes the issue by simply declaring 'info' as a variable and passing its address to 'rte_dma_info_get'. Fixes: 9449330a8458 ("dma/idxd: create dmadev instances on PCI probe") Cc: stable@dpdk.org Signed-off-by: Kevin Laatz Acked-by: Bruce Richardson --- drivers/dma/idxd/idxd_pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/dma/idxd/idxd_pci.c b/drivers/dma/idxd/idxd_pci.c index 9349c56b3f..3c1effeb84 100644 --- a/drivers/dma/idxd/idxd_pci.c +++ b/drivers/dma/idxd/idxd_pci.c @@ -379,10 +379,10 @@ idxd_dmadev_remove_pci(struct rte_pci_device *dev) IDXD_PMD_INFO("Closing %s on NUMA node %d", name, dev->device.numa_node); RTE_DMA_FOREACH_DEV(i) { - struct rte_dma_info *info = {0}; - rte_dma_info_get(i, info); - if (strncmp(name, info->dev_name, strlen(name)) == 0) - idxd_dmadev_destroy(info->dev_name); + struct rte_dma_info info; + rte_dma_info_get(i, &info); + if (strncmp(name, info.dev_name, strlen(name)) == 0) + idxd_dmadev_destroy(info.dev_name); } return 0;