iavf: Fix a locking bug in an error path

bvanassche · kuba-moo · commit e589adf5b70c · 2025-02-11T18:02:04.000-08:00
If the netdev lock has been obtained, unlock it before returning. This bug has been detected by the Clang thread-safety analyzer. Fixes: afc6649 ("eth: iavf: extend the netdev_lock usage") Signed-off-by: Bart Van Assche <bvanassche@acm.org> Link: https://patch.msgid.link/20250206175114.1974171-28-bvanassche@acm.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -2903,8 +2903,8 @@ static void iavf_watchdog_task(struct work_struct *work)
 	}
 
 	mutex_unlock(&adapter->crit_lock);
-	netdev_unlock(netdev);
 restart_watchdog:
+	netdev_unlock(netdev);
 	if (adapter->state >= __IAVF_DOWN)
 		queue_work(adapter->wq, &adapter->adminq_task);
 	if (adapter->aq_required)

Original file line number	Diff line number	Diff line change
`@@ -2903,8 +2903,8 @@ static void iavf_watchdog_task(struct work_struct *work)`
`2903`	`2903`	`}`
`2904`	`2904`
`2905`	`2905`	`mutex_unlock(&adapter->crit_lock);`
`2906`		`- netdev_unlock(netdev);`
`2907`	`2906`	`restart_watchdog:`
	`2907`	`+ netdev_unlock(netdev);`
`2908`	`2908`	`if (adapter->state >= __IAVF_DOWN)`
`2909`	`2909`	`queue_work(adapter->wq, &adapter->adminq_task);`
`2910`	`2910`	`if (adapter->aq_required)`