Skip to content

Commit 7b9269d

Browse files
ISCAS-Vulabgregkh
authored andcommitted
ice: ice_adapter: release xa entry on adapter allocation failure
[ Upstream commit 2db687f ] 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. Reorder the operations as suggested by Przemek Kitszel: 1. Check if adapter already exists (xa_load) 2. Reserve the XArray slot (xa_reserve) 3. Allocate the adapter (ice_adapter_new) 4. Store the adapter (xa_store) Fixes: 0f0023c ("ice: do not init struct ice_adapter more times than needed") Suggested-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Suggested-by: Jacob Keller <jacob.e.keller@intel.com> Signed-off-by: Haotian Zhang <vulab@iscas.ac.cn> Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Link: https://patch.msgid.link/20251001115336.1707-1-vulab@iscas.ac.cn Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 70acdd1 commit 7b9269d

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

drivers/net/ethernet/intel/ice/ice_adapter.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,21 @@ struct ice_adapter *ice_adapter_get(struct pci_dev *pdev)
9898

9999
index = ice_adapter_xa_index(pdev);
100100
scoped_guard(mutex, &ice_adapters_mutex) {
101-
err = xa_insert(&ice_adapters, index, NULL, GFP_KERNEL);
102-
if (err == -EBUSY) {
103-
adapter = xa_load(&ice_adapters, index);
101+
adapter = xa_load(&ice_adapters, index);
102+
if (adapter) {
104103
refcount_inc(&adapter->refcount);
105104
WARN_ON_ONCE(adapter->index != ice_adapter_index(pdev));
106105
return adapter;
107106
}
107+
err = xa_reserve(&ice_adapters, index, GFP_KERNEL);
108108
if (err)
109109
return ERR_PTR(err);
110110

111111
adapter = ice_adapter_new(pdev);
112-
if (!adapter)
112+
if (!adapter) {
113+
xa_release(&ice_adapters, index);
113114
return ERR_PTR(-ENOMEM);
115+
}
114116
xa_store(&ice_adapters, index, adapter, GFP_KERNEL);
115117
}
116118
return adapter;

0 commit comments

Comments
 (0)