hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi: target: core: Avoid using lun_tg_pt_gp after unlock 

core_alua_state_lba_dependent() currently uses lun->lun_tg_pt_gp without
holding the lun_tg_pt_gp_lock. The lock is taken in the caller, so obtain
the needed tg_pt_gp_id there instead.

Link: https://lore.kernel.org/r/20210728115353.2396-2-ddiss@suse.de
Cc: Hannes Reinecke <hare@suse.de>
Reviewed-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: David Disseldorp <ddiss@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
David Disseldorp 2021-07-28 13:53:52 +02:00 committed by Martin K. Petersen
parent 018c14911d
commit 7e457e5efc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/target/target_core_alua.c
View File

@ -460,7 +460,7 @@ static inline void core_alua_state_nonoptimized(
static inline int core_alua_state_lba_dependent( static inline int core_alua_state_lba_dependent(
struct se_cmd *cmd, struct se_cmd *cmd,
struct t10_alua_tg_pt_gp *tg_pt_gp) u16 tg_pt_gp_id)
{ {
struct se_device *dev = cmd->se_dev; struct se_device *dev = cmd->se_dev;
u64 segment_size, segment_mult, sectors, lba; u64 segment_size, segment_mult, sectors, lba;
@ -511,8 +511,7 @@ static inline int core_alua_state_lba_dependent(
} }
list_for_each_entry(map_mem, &cur_map->lba_map_mem_list, list_for_each_entry(map_mem, &cur_map->lba_map_mem_list,
lba_map_mem_list) { lba_map_mem_list) {
if (map_mem->lba_map_mem_alua_pg_id != if (map_mem->lba_map_mem_alua_pg_id != tg_pt_gp_id)
tg_pt_gp->tg_pt_gp_id)
continue; continue;
switch(map_mem->lba_map_mem_alua_state) { switch(map_mem->lba_map_mem_alua_state) {
case ALUA_ACCESS_STATE_STANDBY: case ALUA_ACCESS_STATE_STANDBY:
@ -674,6 +673,7 @@ target_alua_state_check(struct se_cmd *cmd)
struct se_lun *lun = cmd->se_lun; struct se_lun *lun = cmd->se_lun;
struct t10_alua_tg_pt_gp *tg_pt_gp; struct t10_alua_tg_pt_gp *tg_pt_gp;
int out_alua_state, nonop_delay_msecs; int out_alua_state, nonop_delay_msecs;
u16 tg_pt_gp_id;
if (dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE) if (dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE)
return 0; return 0;
@ -698,8 +698,8 @@ target_alua_state_check(struct se_cmd *cmd)
tg_pt_gp = lun->lun_tg_pt_gp; tg_pt_gp = lun->lun_tg_pt_gp;
out_alua_state = tg_pt_gp->tg_pt_gp_alua_access_state; out_alua_state = tg_pt_gp->tg_pt_gp_alua_access_state;
nonop_delay_msecs = tg_pt_gp->tg_pt_gp_nonop_delay_msecs; nonop_delay_msecs = tg_pt_gp->tg_pt_gp_nonop_delay_msecs;
tg_pt_gp_id = tg_pt_gp->tg_pt_gp_id;
// XXX: keeps using tg_pt_gp witout reference after unlock
spin_unlock(&lun->lun_tg_pt_gp_lock); spin_unlock(&lun->lun_tg_pt_gp_lock);
/* /*
* Process ALUA_ACCESS_STATE_ACTIVE_OPTIMIZED in a separate conditional * Process ALUA_ACCESS_STATE_ACTIVE_OPTIMIZED in a separate conditional
@ -727,7 +727,7 @@ target_alua_state_check(struct se_cmd *cmd)
return TCM_CHECK_CONDITION_NOT_READY; return TCM_CHECK_CONDITION_NOT_READY;
break; break;
case ALUA_ACCESS_STATE_LBA_DEPENDENT: case ALUA_ACCESS_STATE_LBA_DEPENDENT:
if (core_alua_state_lba_dependent(cmd, tg_pt_gp)) if (core_alua_state_lba_dependent(cmd, tg_pt_gp_id))
return TCM_CHECK_CONDITION_NOT_READY; return TCM_CHECK_CONDITION_NOT_READY;
break; break;
/* /*