| Message ID | 20250410115225.59462-1-larysa.zaremba@intel.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [iwl-net] idpf: protect shutdown from reset | expand |
On Thu, Apr 10, 2025 at 01:52:23PM +0200, Larysa Zaremba wrote: > Before the referenced commit, the shutdown just called idpf_remove(), > this way IDPF_REMOVE_IN_PROG was protecting us from the serv_task > rescheduling reset. Without this flag set the shutdown process is > vulnerable to HW reset or any other triggering conditions (such as > default mailbox being destroyed). > > When one of conditions checked in idpf_service_task becomes true, > vc_event_task can be rescheduled during shutdown, this leads to accessing > freed memory e.g. idpf_req_rel_vector_indexes() trying to read > vport->q_vector_idxs. This in turn causes the system to become defunct > during e.g. systemctl kexec. > > Considering using IDPF_REMOVE_IN_PROG would lead to more heavy shutdown > process, instead just cancel the serv_task before cancelling > adapter->serv_task before cancelling adapter->vc_event_task to ensure that > reset will not be scheduled while we are doing a shutdown. > > Fixes: 4c9106f4906a ("idpf: fix adapter NULL pointer dereference on reboot") > Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> > Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com> Reviewed-by: Simon Horman <horms@kernel.org>
On 4/10/2025 4:52 AM, Larysa Zaremba wrote: > Before the referenced commit, the shutdown just called idpf_remove(), > this way IDPF_REMOVE_IN_PROG was protecting us from the serv_task > rescheduling reset. Without this flag set the shutdown process is > vulnerable to HW reset or any other triggering conditions (such as > default mailbox being destroyed). > > When one of conditions checked in idpf_service_task becomes true, > vc_event_task can be rescheduled during shutdown, this leads to accessing > freed memory e.g. idpf_req_rel_vector_indexes() trying to read > vport->q_vector_idxs. This in turn causes the system to become defunct > during e.g. systemctl kexec. > > Considering using IDPF_REMOVE_IN_PROG would lead to more heavy shutdown > process, instead just cancel the serv_task before cancelling > adapter->serv_task before cancelling adapter->vc_event_task to ensure that > reset will not be scheduled while we are doing a shutdown. > > Fixes: 4c9106f4906a ("idpf: fix adapter NULL pointer dereference on reboot") > Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> > Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com> > --- > drivers/net/ethernet/intel/idpf/idpf_main.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/ethernet/intel/idpf/idpf_main.c b/drivers/net/ethernet/intel/idpf/idpf_main.c > index bec4a02c5373..b35713036a54 100644 > --- a/drivers/net/ethernet/intel/idpf/idpf_main.c > +++ b/drivers/net/ethernet/intel/idpf/idpf_main.c > @@ -89,6 +89,7 @@ static void idpf_shutdown(struct pci_dev *pdev) > { > struct idpf_adapter *adapter = pci_get_drvdata(pdev); > > + cancel_delayed_work_sync(&adapter->serv_task); > cancel_delayed_work_sync(&adapter->vc_event_task); > idpf_vc_core_deinit(adapter); > idpf_deinit_dflt_mbx(adapter); Reviewed-by: Emil Tantilov <emil.s.tantilov@intel.com>
diff --git a/drivers/net/ethernet/intel/idpf/idpf_main.c b/drivers/net/ethernet/intel/idpf/idpf_main.c index bec4a02c5373..b35713036a54 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_main.c +++ b/drivers/net/ethernet/intel/idpf/idpf_main.c @@ -89,6 +89,7 @@ static void idpf_shutdown(struct pci_dev *pdev) { struct idpf_adapter *adapter = pci_get_drvdata(pdev); + cancel_delayed_work_sync(&adapter->serv_task); cancel_delayed_work_sync(&adapter->vc_event_task); idpf_vc_core_deinit(adapter); idpf_deinit_dflt_mbx(adapter);
Before the referenced commit, the shutdown just called idpf_remove(), this way IDPF_REMOVE_IN_PROG was protecting us from the serv_task rescheduling reset. Without this flag set the shutdown process is vulnerable to HW reset or any other triggering conditions (such as default mailbox being destroyed). When one of conditions checked in idpf_service_task becomes true, vc_event_task can be rescheduled during shutdown, this leads to accessing freed memory e.g. idpf_req_rel_vector_indexes() trying to read vport->q_vector_idxs. This in turn causes the system to become defunct during e.g. systemctl kexec. Considering using IDPF_REMOVE_IN_PROG would lead to more heavy shutdown process, instead just cancel the serv_task before cancelling adapter->serv_task before cancelling adapter->vc_event_task to ensure that reset will not be scheduled while we are doing a shutdown. Fixes: 4c9106f4906a ("idpf: fix adapter NULL pointer dereference on reboot") Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com> --- drivers/net/ethernet/intel/idpf/idpf_main.c | 1 + 1 file changed, 1 insertion(+)