It is allowed to pass a zero timeout value to fc_seq_exch_abort().
Avoid that this can cause the timeout function to drop the exchange
reference before it has been increased by fc_exch_timer_set_locked().
This patch fixes a crash when running FCoE target code with poisoning
enabled in the memory allocator.

Signed-off-by: Bart Van Assche <[email protected]>
Cc: Robert Love <[email protected]>
Cc: Neil Horman <[email protected]>
---
 drivers/scsi/libfc/fc_exch.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 48f3293..d147068 100644
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -360,9 +360,10 @@ static inline void fc_exch_timer_set_locked(struct fc_exch 
*ep,
 
        FC_EXCH_DBG(ep, "Exchange timer armed : %d msecs\n", timer_msec);
 
-       if (queue_delayed_work(fc_exch_workqueue, &ep->timeout_work,
-                              msecs_to_jiffies(timer_msec)))
-               fc_exch_hold(ep);               /* hold for timer */
+       fc_exch_hold(ep);               /* hold for timer */
+       if (!queue_delayed_work(fc_exch_workqueue, &ep->timeout_work,
+                               msecs_to_jiffies(timer_msec)))
+               fc_exch_release(ep);
 }
 
 /**
-- 
1.7.10.4

_______________________________________________
fcoe-devel mailing list
[email protected]
http://lists.open-fcoe.org/mailman/listinfo/fcoe-devel

Reply via email to