net: pds_core: Fix possible double free in error handling path
[ Upstream commitba18deddd6] When auxiliary_device_add() returns error and then calls auxiliary_device_uninit(), Callback function pdsc_auxbus_dev_release calls kfree(padev) to free memory. We shouldn't call kfree(padev) again in the error handling path. Fix this by cleaning up the redundant kfree() and putting the error handling back to where the errors happened. Fixes:4569cce43b("pds_core: add auxiliary_bus devices") Signed-off-by: Yongzhi Liu <hyperlyzcs@gmail.com> Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com> Reviewed-by: Shannon Nelson <shannon.nelson@amd.com> Link: https://lore.kernel.org/r/20240306105714.20597-1-hyperlyzcs@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
@@ -160,23 +160,19 @@ static struct pds_auxiliary_dev *pdsc_auxbus_dev_register(struct pdsc *cf,
|
||||
if (err < 0) {
|
||||
dev_warn(cf->dev, "auxiliary_device_init of %s failed: %pe\n",
|
||||
name, ERR_PTR(err));
|
||||
goto err_out;
|
||||
kfree(padev);
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
err = auxiliary_device_add(aux_dev);
|
||||
if (err) {
|
||||
dev_warn(cf->dev, "auxiliary_device_add of %s failed: %pe\n",
|
||||
name, ERR_PTR(err));
|
||||
goto err_out_uninit;
|
||||
auxiliary_device_uninit(aux_dev);
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
return padev;
|
||||
|
||||
err_out_uninit:
|
||||
auxiliary_device_uninit(aux_dev);
|
||||
err_out:
|
||||
kfree(padev);
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
int pdsc_auxbus_dev_del(struct pdsc *cf, struct pdsc *pf)
|
||||
|
||||
Reference in New Issue
Block a user