]> git.baikalelectronics.ru Git - kernel.git/commitdiff
iavf: fix double unlock of crit_lock
authorStefan Assmann <sassmann@kpanic.de>
Tue, 24 Aug 2021 10:06:39 +0000 (12:06 +0200)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Wed, 6 Oct 2021 16:49:34 +0000 (09:49 -0700)
The crit_lock mutex could be unlocked twice as reported here
https://lists.osuosl.org/pipermail/intel-wired-lan/Week-of-Mon-20210823/025525.html

Remove the superfluous unlock. Technically the problem was already
present before 04ce4f248088 as that commit only replaced the locking
primitive, but no functional change.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: 04ce4f248088 ("iavf: use mutexes for locking of critical sections")
Fixes: c6431d554e25 ("iavf: Refactor the watchdog state machine")
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/iavf/iavf_main.c

index 23762a7ef740b261a950e2e454a5a6c0d82d682a..cada4e0e40b48eda0b40a3df56ab7576a4348123 100644 (file)
@@ -1965,7 +1965,6 @@ static void iavf_watchdog_task(struct work_struct *work)
                }
                adapter->aq_required = 0;
                adapter->current_op = VIRTCHNL_OP_UNKNOWN;
-               mutex_unlock(&adapter->crit_lock);
                queue_delayed_work(iavf_wq,
                                   &adapter->watchdog_task,
                                   msecs_to_jiffies(10));