d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

raw/ioat: fix dereference before null check

Browse Source 
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: ff06fa2cf3 ("raw/ioat: probe idxd PCI")

Signed-off-by: Kevin Laatz <kevin.laatz@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Kevin Laatz 2020-10-14 11:11:10 +01:00 committed by Thomas Monjalon
parent e30b2833c4
commit b6ab5bbd73
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/raw/ioat/idxd_pci.c
View File

@ -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);