[dpdk-dev] [PATCH] raw/ioat: fix dereference before null check
Kevin Laatz
kevin.laatz at intel.com
Wed Oct 14 12:11:10 CEST 2020
The 'idxd' pointer in 'idxd_rawdev_destroy()' is being dereferenced before
it is checked. To fix this, the null pointer check was moved to occur
earlier in the code.
Coverity issue: 363040
Fixes: ff06fa2cf3ba ("raw/ioat: probe idxd PCI")
Signed-off-by: Kevin Laatz <kevin.laatz at intel.com>
---
drivers/raw/ioat/idxd_pci.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/raw/ioat/idxd_pci.c b/drivers/raw/ioat/idxd_pci.c
index 165a9ea7f1..d4d87b199d 100644
--- a/drivers/raw/ioat/idxd_pci.c
+++ b/drivers/raw/ioat/idxd_pci.c
@@ -290,6 +290,10 @@ idxd_rawdev_destroy(const char *name)
}
idxd = rdev->dev_private;
+ if (!idxd) {
+ IOAT_PMD_ERR("Error getting dev_private");
+ return -EINVAL;
+ }
/* disable the device */
err_code = idxd_pci_dev_command(idxd, idxd_disable_dev);
@@ -300,13 +304,11 @@ idxd_rawdev_destroy(const char *name)
IOAT_PMD_DEBUG("IDXD Device disabled OK");
/* free device memory */
- if (rdev->dev_private != NULL) {
- IOAT_PMD_DEBUG("Freeing device driver memory");
- rdev->dev_private = NULL;
- rte_free(idxd->public.batch_ring);
- rte_free(idxd->public.hdl_ring);
- rte_memzone_free(idxd->mz);
- }
+ IOAT_PMD_DEBUG("Freeing device driver memory");
+ rdev->dev_private = NULL;
+ rte_free(idxd->public.batch_ring);
+ rte_free(idxd->public.hdl_ring);
+ rte_memzone_free(idxd->mz);
/* rte_rawdev_close is called by pmd_release */
ret = rte_rawdev_pmd_release(rdev);
--
2.25.1
More information about the dev
mailing list