Skip to contentSkip to conversation

qla2xxx: Fix NULL pointer dereference in target mode

PATCH In review Gleb Chesnokov 3 participants 6 messages May 11, 2023 – May 23, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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.

Fixes 1d201c81d4cc ("scsi: qla2xxx: Select qpair depending on which CPU post_cmd() gets called")

---
 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
index df5e5b7fdcfe..84aa3571be6d 100644
@@ -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
index ec0423ec6681..1a955c3ff3d6 100644
@@ -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
index cce6e425c121..a6e2c7d4ff87 100644
@@ -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
index 71feda2cdb63..245e3a5d81fd 100644
@@ -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
Reviewed-by on v1 1/1
#1 lore raw
Quoted 89 lines · Gleb Chesnokov

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.

Fixes 1d201c81d4cc ("scsi: qla2xxx: Select qpair depending on which CPU post_cmd() gets called")
---
 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
index df5e5b7fdcfe..84aa3571be6d 100644
@@ -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
index ec0423ec6681..1a955c3ff3d6 100644
@@ -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
index cce6e425c121..a6e2c7d4ff87 100644
@@ -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 +3 -0
index 71feda2cdb63..245e3a5d81fd 100644
@@ -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.

Reviewed-by Himanshu Madhani <[email protected] <mailto:[email protected]>>
Signature · 1 line
Himanshu Madhani Oracle Linux Engineering
#2 lore raw
In reply to Gleb Chesnokov

Hi Gleb!

Quoted 9 lines

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.

Your patch is whitespace-mangled. Please fix and resubmit.

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
#3 lore raw

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.

Fixes 1d201c81d4cc ("scsi: qla2xxx: Select qpair depending on which CPU post_cmd() gets called")

---
 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
index df5e5b7fdcfe..84aa3571be6d 100644
@@ -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
index ec0423ec6681..1a955c3ff3d6 100644
@@ -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
index cce6e425c121..a6e2c7d4ff87 100644
@@ -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
index 71feda2cdb63..245e3a5d81fd 100644
@@ -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
#4 lore raw
Quoted 11 lines · Gleb Chesnokov

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.

[...]

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
#5 lore raw
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 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.

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