When ice_adapter_new() fails, the reserved XArray entry created by
xa_insert() is not released. This causes subsequent insertions at
the same index to return -EBUSY, potentially leading to
NULL pointer dereferences.
Release the reserved entry with xa_release() when adapter allocation
fails to prevent this issue.
Fixes: 0f0023c649c7 ("ice: do not init struct ice_adapter more times than
needed")
Suggested-by: Jacob Keller <[email protected]>
Signed-off-by: Haotian Zhang <[email protected]>
---
Changes in v2:
- Instead of checking the return value of xa_store(), fix the real bug
where a failed ice_adapter_new() would leave a stale entry in the
XArray.
- Use xa_release() to clean up the reserved entry, as suggested by
Jacob Keller.
---
drivers/net/ethernet/intel/ice/ice_adapter.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_adapter.c
b/drivers/net/ethernet/intel/ice/ice_adapter.c
index b53561c34708..9eb100b11439 100644
--- a/drivers/net/ethernet/intel/ice/ice_adapter.c
+++ b/drivers/net/ethernet/intel/ice/ice_adapter.c
@@ -110,8 +110,10 @@ struct ice_adapter *ice_adapter_get(struct pci_dev *pdev)
return ERR_PTR(err);
adapter = ice_adapter_new(pdev);
- if (!adapter)
+ if (!adapter) {
+ xa_release(&ice_adapters, index);
return ERR_PTR(-ENOMEM);
+ }
xa_store(&ice_adapters, index, adapter, GFP_KERNEL);
}
return adapter;
--
2.50.1.windows.1
