qla2xxx: Fix NULL pointer dereference in target mode
Subsystems (2)
PATCH 1/1 qla2xxx: Fix NULL pointer dereference in target mode
When target mode is enabled, the pci_irq_get_affinity() function may return a NULL value in qla_mapq_init_qp_cpu_map() due to the qla24xx_enable_msix() code that handles IRQ settings for target mode. This leads to a crash due to a NULL pointer dereference.
This patch fixes the issue by adding a check for the NULL value returned by pci_irq_get_affinity() and introducing a 'cpu_mapped' boolean flag to the qla_qpair structure, ensuring that the qpair's CPU affinity is updated when it has not been mapped to a CPU.
---
drivers/scsi/qla2xxx/qla_def.h | 1 +
drivers/scsi/qla2xxx/qla_init.c | 3 +++
drivers/scsi/qla2xxx/qla_inline.h | 6 ++++++
drivers/scsi/qla2xxx/qla_isr.c | 3 +++
4 files changed, 13 insertions(+)
drivers/scsi/qla2xxx/qla_def.h +0 -0
@@ -3796,6 +3796,7 @@ struct qla_qpair {
uint64_t retry_term_jiff;
struct qla_tgt_counters tgt_counters; uint16_t cpuid;
+ bool cpu_mapped;
struct qla_fw_resources fwres ____cacheline_aligned; struct qla_buf_pool buf_pool;
u32 cmd_cnt;
drivers/scsi/qla2xxx/qla_init.c +0 -0
@@ -9426,6 +9426,9 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos,
qpair->rsp->req = qpair->req;
qpair->rsp->qpair = qpair;
+ if (!qpair->cpu_mapped)
+ qla_cpu_update(qpair, raw_smp_processor_id()); +
if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) { if (ha->fw_attributes & BIT_4) qpair->difdix_supported = 1;
drivers/scsi/qla2xxx/qla_inline.h +0 -0
@@ -538,12 +538,18 @@ qla_mapq_init_qp_cpu_map(struct qla_hw_data *ha,
if (!ha->qp_cpu_map)
return;
+
mask = pci_irq_get_affinity(ha->pdev, msix->vector_base0); + if (!mask)
+ return;
+
qpair->cpuid = cpumask_first(mask); for_each_cpu(cpu, mask) {
ha->qp_cpu_map[cpu] = qpair;
}
msix->cpuid = qpair->cpuid;
+
+ qpair->cpu_mapped = true;
}
static inline void
drivers/scsi/qla2xxx/qla_isr.c +0 -0
@@ -3770,6 +3770,9 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
if (rsp->qpair->cpuid != smp_processor_id() || !rsp->qpair->rcv_intr) { rsp->qpair->rcv_intr = 1;
+
+ if (!rsp->qpair->cpu_mapped)
+ qla_cpu_update(rsp->qpair, raw_smp_processor_id()); }
#define __update_rsp_in(_is_shadow_hba, _rsp, _rsp_in) \
Signature · 1 line
2.40.1
Quoted 89 lines · Gleb Chesnokov
When target mode is enabled, the
pci_irq_get_affinity()function may return a NULL value inqla_mapq_init_qp_cpu_map()due to theqla24xx_enable_msix()code that handles IRQ settings for target mode. This leads to a crash due to a NULL pointer dereference.This patch fixes the issue by adding a check for the NULL value returned by
pci_irq_get_affinity()and introducing a 'cpu_mapped' boolean flag to theqla_qpairstructure, ensuring that the qpair's CPU affinity is updated when it has not been mapped to a CPU.Fixes 1d201c81d4cc ("scsi: qla2xxx: Select qpair depending on which CPU post_cmd() gets called")Signed-off-by Gleb Chesnokov <[email protected]>--- drivers/scsi/qla2xxx/qla_def.h | 1 + drivers/scsi/qla2xxx/qla_init.c | 3 +++ drivers/scsi/qla2xxx/qla_inline.h | 6 ++++++ drivers/scsi/qla2xxx/qla_isr.c | 3 +++ 4 files changed, 13 insertions(+)drivers/scsi/qla2xxx/qla_def.h +1
-0@@ -3796,6 +3796,7 @@ struct qla_qpair {uint64_t retry_term_jiff;struct qla_tgt_counters tgt_counters;uint16_t cpuid; +bool cpu_mapped;struct qla_fw_resources fwres____cacheline_aligned ;struct qla_buf_pool buf_pool;u32 cmd_cnt;drivers/scsi/qla2xxx/qla_init.c +3
-0@@ -9426,6 +9426,9 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos, qpair->rsp->req = qpair->req; qpair->rsp->qpair = qpair; +if (!qpair->cpu_mapped) +qla_cpu_update (qpair,raw_smp_processor_id ()); +if (IS_T10_PI_CAPABLE (ha) && ql2xenabledif) {if (ha->fw_attributes &BIT_4 ) qpair->difdix_supported =1 ;drivers/scsi/qla2xxx/qla_inline.h +6
-0@@ -538,12 +538,18 @@ qla_mapq_init_qp_cpu_map(struct qla_hw_data *ha,if (!ha->qp_cpu_map)return ; + mask =pci_irq_get_affinity (ha->pdev, msix->vector_base0); +if (!mask) +return ; + qpair->cpuid =cpumask_first (mask);for_each_cpu (cpu, mask) { ha->qp_cpu_map[cpu] = qpair; } msix->cpuid = qpair->cpuid; + + qpair->cpu_mapped = true; } static inline voiddrivers/scsi/qla2xxx/qla_isr.c +3
-0@@ -3770,6 +3770,9 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,if (rsp->qpair->cpuid !=smp_processor_id () || !rsp->qpair->rcv_intr) { rsp->qpair->rcv_intr =1 ; + +if (!rsp->qpair->cpu_mapped) +qla_cpu_update (rsp->qpair,raw_smp_processor_id ()); }#define __update_rsp_in (_is_shadow_hba, _rsp, _rsp_in) \Signature · 1 line
2.40.1
Looks Good.
Signature · 1 line
Himanshu Madhani Oracle Linux Engineering
Hi Gleb!
Quoted 9 lines
When target mode is enabled, the
pci_irq_get_affinity()function may return a NULL value inqla_mapq_init_qp_cpu_map()due to theqla24xx_enable_msix()code that handles IRQ settings for target mode. This leads to a crash due to a NULL pointer dereference.This patch fixes the issue by adding a check for the NULL value returned by
pci_irq_get_affinity()and introducing a 'cpu_mapped' boolean flag to theqla_qpairstructure, ensuring that the qpair's CPU affinity is updated when it has not been mapped to a CPU.
Your patch is whitespace-mangled. Please fix and resubmit.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
PATCH 1/1 qla2xxx: Fix NULL pointer dereference in target mode
When target mode is enabled, the pci_irq_get_affinity() function may return a NULL value in qla_mapq_init_qp_cpu_map() due to the qla24xx_enable_msix() code that handles IRQ settings for target mode. This leads to a crash due to a NULL pointer dereference.
This patch fixes the issue by adding a check for the NULL value returned by pci_irq_get_affinity() and introducing a 'cpu_mapped' boolean flag to the qla_qpair structure, ensuring that the qpair's CPU affinity is updated when it has not been mapped to a CPU.
---
drivers/scsi/qla2xxx/qla_def.h | 1 +
drivers/scsi/qla2xxx/qla_init.c | 3 +++
drivers/scsi/qla2xxx/qla_inline.h | 6 ++++++
drivers/scsi/qla2xxx/qla_isr.c | 3 +++
4 files changed, 13 insertions(+)
drivers/scsi/qla2xxx/qla_def.h +0 -0
@@ -3796,6 +3796,7 @@ struct qla_qpair {
uint64_t retry_term_jiff;
struct qla_tgt_counters tgt_counters; uint16_t cpuid;
+ bool cpu_mapped;
struct qla_fw_resources fwres ____cacheline_aligned; struct qla_buf_pool buf_pool;
u32 cmd_cnt;
drivers/scsi/qla2xxx/qla_init.c +0 -0
@@ -9426,6 +9426,9 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos,
qpair->rsp->req = qpair->req;
qpair->rsp->qpair = qpair;
+ if (!qpair->cpu_mapped)
+ qla_cpu_update(qpair, raw_smp_processor_id()); +
if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) { if (ha->fw_attributes & BIT_4) qpair->difdix_supported = 1;
drivers/scsi/qla2xxx/qla_inline.h +0 -0
@@ -538,12 +538,18 @@ qla_mapq_init_qp_cpu_map(struct qla_hw_data *ha,
if (!ha->qp_cpu_map)
return;
+
mask = pci_irq_get_affinity(ha->pdev, msix->vector_base0); + if (!mask)
+ return;
+
qpair->cpuid = cpumask_first(mask); for_each_cpu(cpu, mask) {
ha->qp_cpu_map[cpu] = qpair;
}
msix->cpuid = qpair->cpuid;
+
+ qpair->cpu_mapped = true;
}
static inline void
drivers/scsi/qla2xxx/qla_isr.c +0 -0
@@ -3770,6 +3770,9 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
if (rsp->qpair->cpuid != smp_processor_id() || !rsp->qpair->rcv_intr) { rsp->qpair->rcv_intr = 1;
+
+ if (!rsp->qpair->cpu_mapped)
+ qla_cpu_update(rsp->qpair, raw_smp_processor_id()); }
#define __update_rsp_in(_is_shadow_hba, _rsp, _rsp_in) \
Signature · 1 line
2.40.1
Martin K. Petersen
AppliedQuoted 11 lines · Gleb Chesnokov
When target mode is enabled, the
pci_irq_get_affinity()function may return a NULL value inqla_mapq_init_qp_cpu_map()due to theqla24xx_enable_msix()code that handles IRQ settings for target mode. This leads to a crash due to a NULL pointer dereference.This patch fixes the issue by adding a check for the NULL value returned by
pci_irq_get_affinity()and introducing a 'cpu_mapped' boolean flag to theqla_qpairstructure, ensuring that the qpair's CPU affinity is updated when it has not been mapped to a CPU.[...]
Applied to 6.4/scsi-fixes. Whitespace was still mangled so I had to apply by hand. Please verify, thanks!
[1/1] qla2xxx: Fix NULL pointer dereference in target mode
https://git.kernel.org/mkp/scsi/c/d54820b22e40
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Quoted 12 lines · Martin K. Petersen
Quoted 10 lines · Gleb Chesnokov
When target mode is enabled, the
pci_irq_get_affinity()function may return a NULL value inqla_mapq_init_qp_cpu_map()due to theqla24xx_enable_msix()code that handles IRQ settings for target mode. This leads to a crash due to a NULL pointer dereference.This patch fixes the issue by adding a check for the NULL value returned by
pci_irq_get_affinity()and introducing a 'cpu_mapped' boolean flag to theqla_qpairstructure, ensuring that the qpair's CPU affinity is updated when it has not been mapped to a CPU.
Quoted 8 lines
Quoted 1 line
[...]
Applied to 6.4/scsi-fixes. Whitespace was still mangled so I had to apply by hand. Please verify, thanks!
[1/1] qla2xxx: Fix NULL pointer dereference in target mode
https://git.kernel.org/mkp/scsi/c/d54820b22e40
Sorry, I had some problems with Thunderbird; I have resolved them now. I've reviewed the patch you applied manually, and it appears to be accurate.
Thanks,
Gleb