Skip to content

Commit db78375

Browse files
etantilovgregkh
authored andcommitted
ice: fix NULL pointer dereference in ice_unplug_aux_dev() on reset
[ Upstream commit 60dfe24 ] Issuing a reset when the driver is loaded without RDMA support, will results in a crash as it attempts to remove RDMA's non-existent auxbus device: echo 1 > /sys/class/net/<if>/device/reset BUG: kernel NULL pointer dereference, address: 0000000000000008 ... RIP: 0010:ice_unplug_aux_dev+0x29/0x70 [ice] ... Call Trace: <TASK> ice_prepare_for_reset+0x77/0x260 [ice] pci_dev_save_and_disable+0x2c/0x70 pci_reset_function+0x88/0x130 reset_store+0x5a/0xa0 kernfs_fop_write_iter+0x15e/0x210 vfs_write+0x273/0x520 ksys_write+0x6b/0xe0 do_syscall_64+0x79/0x3b0 entry_SYSCALL_64_after_hwframe+0x76/0x7e ice_unplug_aux_dev() checks pf->cdev_info->adev for NULL pointer, but pf->cdev_info will also be NULL, leading to the deref in the trace above. Introduce a flag to be set when the creation of the auxbus device is successful, to avoid multiple NULL pointer checks in ice_unplug_aux_dev(). Fixes: c24a65b ("iidc/ice/irdma: Update IDC to support multiple consumers") Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com> Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 7359123 commit db78375

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

drivers/net/ethernet/intel/ice/ice.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,7 @@ enum ice_pf_flags {
509509
ICE_FLAG_LINK_LENIENT_MODE_ENA,
510510
ICE_FLAG_PLUG_AUX_DEV,
511511
ICE_FLAG_UNPLUG_AUX_DEV,
512+
ICE_FLAG_AUX_DEV_CREATED,
512513
ICE_FLAG_MTU_CHANGED,
513514
ICE_FLAG_GNSS, /* GNSS successfully initialized */
514515
ICE_FLAG_DPLL, /* SyncE/PTP dplls initialized */

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ int ice_plug_aux_dev(struct ice_pf *pf)
336336
mutex_lock(&pf->adev_mutex);
337337
cdev->adev = adev;
338338
mutex_unlock(&pf->adev_mutex);
339+
set_bit(ICE_FLAG_AUX_DEV_CREATED, pf->flags);
339340

340341
return 0;
341342
}
@@ -347,15 +348,16 @@ void ice_unplug_aux_dev(struct ice_pf *pf)
347348
{
348349
struct auxiliary_device *adev;
349350

351+
if (!test_and_clear_bit(ICE_FLAG_AUX_DEV_CREATED, pf->flags))
352+
return;
353+
350354
mutex_lock(&pf->adev_mutex);
351355
adev = pf->cdev_info->adev;
352356
pf->cdev_info->adev = NULL;
353357
mutex_unlock(&pf->adev_mutex);
354358

355-
if (adev) {
356-
auxiliary_device_delete(adev);
357-
auxiliary_device_uninit(adev);
358-
}
359+
auxiliary_device_delete(adev);
360+
auxiliary_device_uninit(adev);
359361
}
360362

361363
/**

0 commit comments

Comments
 (0)