diff options
| author |   tangwenji <tang.wenji@zte.com.cn> | 2017-08-16 16:39:00 +0800 |
|---|---|---|
| committer |   Nicholas Bellinger <nab@linux-iscsi.org> | 2017-11-04 14:45:20 -0700 |
| commit | 88fb2fa7db7510bf1078226ab48d162d9854f3d4 (patch) | |
| tree | cb697101ed1f7aefb4351f2e131c78e6618499e4 /drivers/target | |
| parent | target/file: Do not return error for UNMAP if length is zero (diff) | |
| download | linux-dev-88fb2fa7db7510bf1078226ab48d162d9854f3d4.tar.xz linux-dev-88fb2fa7db7510bf1078226ab48d162d9854f3d4.zip | |
target: fix null pointer regression in core_tmr_drain_tmr_list
The target system kernel crash when the initiator executes
the sg_persist -A command,because of the second argument to
be set to NULL when core_tmr_lun_reset is called in
core_scsi3_pro_preempt function.
This fixes a regression originally introduced by:
commit 51ec502a32665fed66c7f03799ede4023b212536
Author: Bart Van Assche <bart.vanassche@sandisk.com>
Date: Tue Feb 14 16:25:54 2017 -0800
target: Delete tmr from list before processing
Signed-off-by: tangwenji <tang.wenji@zte.com.cn>
Cc: stable@vger.kernel.org # 4.11+
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
| -rw-r--r-- | drivers/target/target_core_tmr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c index e22847bd79b9..61909b23e959 100644 --- a/drivers/target/target_core_tmr.c +++ b/drivers/target/target_core_tmr.c @@ -217,7 +217,8 @@ static void core_tmr_drain_tmr_list( * LUN_RESET tmr.. */ spin_lock_irqsave(&dev->se_tmr_lock, flags); - list_del_init(&tmr->tmr_list); + if (tmr) + list_del_init(&tmr->tmr_list); list_for_each_entry_safe(tmr_p, tmr_pp, &dev->dev_tmr_list, tmr_list) { cmd = tmr_p->task_cmd; if (!cmd) { |