media: intel/ipu6: fix error pointer dereference
Subsystems (2)
PATCH 1/1 media: intel/ipu6: fix error pointer dereference
After confirming that isp->psys is an error pointer goto is called and imminently goes to this code snippet below:
out_ipu6_bus_del_devices:
if (isp->psys) {
ipu6_cpd_free_pkg_dir(isp->psys);
ipu6_buttress_unmap_fw_image(isp->psys, &isp->psys->fw_sgt);
}Since isp->psys is confirmed to be an error pointer not NULL, the condition is true and the error pointer is dereferenced. So isp->psys should be set to NULL before going to out_ipu6_bus_del_devices.
--- drivers/media/pci/intel/ipu6/ipu6.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/pci/intel/ipu6/ipu6.c +1 -0
@@ -619,6 +619,7 @@ static int ipu6_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) psys_base, &psys_ipdata);if (IS_ERR (isp->psys)) { ret =PTR_ERR (isp->psys); + isp->psys =NULL ; goto out_ipu6_bus_del_devices; }
Signature · 1 line
2.53.0
Sakari Ailus
maintainerHi Ethan,
Thanks for the patch.
Quoted 9 lines · Ethan Tidmore
After confirming that
isp->psysis an error pointer goto is called and imminently goes to this code snippet below:
out_ipu6_bus_del_devices:if (isp->psys) { ipu6_cpd_free_pkg_dir(isp->psys); ipu6_buttress_unmap_fw_image(isp->psys, &isp->psys->fw_sgt); }
Quoted 5 lines
Since
isp->psysis confirmed to be an error pointer not NULL, the condition is true and the error pointer is dereferenced. Soisp->psysshould be set to NULL before going toout_ipu6_bus_del_devices.Fixes 25fedc021985a ("media: intel/ipu6: add Intel IPU6 PCI device driver")
Add:
Quoted 10 lines
Signed-off-by Ethan Tidmore <[email protected]>--- drivers/media/pci/intel/ipu6/ipu6.c | 1 + 1 file changed, 1 insertion(+)drivers/media/pci/intel/ipu6/ipu6.c +0
-0
drivers/media/pci/intel/ipu6/ipu6.c static int ipu6_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) · line 622
Quoted 4 lines
drivers/media/pci/intel/ipu6/ipu6.c +1
-0@@ -619,6 +619,7 @@ static int ipu6_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) psys_base, &psys_ipdata);if (IS_ERR (isp->psys)) { ret =PTR_ERR (isp->psys); + isp->psys =NULL ;
There are a number of checks for IS_ERR_OR_NULL() in error handling; instead of setting psys to NULL here I'd add the same test to the condition after out_ipu6_bus_del_devices:.
Quoted 3 lines
drivers/media/pci/intel/ipu6/ipu6.c +0
-0goto out_ipu6_bus_del_devices; }
Signature · 3 lines
Kind regards, Sakari Ailus