scsi: target: pscsi: Fix possible null-pointer dereference in pscsi_complete_cmd()
Subsystems (2)
PATCH v2 1/1 scsi: target: pscsi: Fix possible null-pointer dereference in pscsi_complete_cmd()
The return value of transport_kmap_data_sg() is assigned to the variable buf:
buf = transport_kmap_data_sg(cmd);
And then it is checked:
if (!buf) {
This indicates that buf can be NULL. However, it is dereferenced in the following statements:
if (!(buf[3] & 0x80))
buf[3] |= 0x80;
if (!(buf[2] & 0x80))
buf[2] |= 0x80;To fix these possible null-pointer dereferences, dereference buf and call transport_kunmap_data_sg() only when buf is not NULL.
---
v2:
* Put transport_kunmap_data_sg() into the else-branch of the if (!bug). Thank Bodo Stroesser for helpful advice.
--- drivers/target/target_core_pscsi.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/target/target_core_pscsi.c +9 -9
@@ -620,17 +620,17 @@ static void pscsi_complete_cmd(struct se_cmd *cmd, u8 scsi_status, buf =transport_kmap_data_sg (cmd);if (!buf) { ;/* XXX: TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE */ - } - -if (cdb[0 ] ==MODE_SENSE_10 ) { -if (!(buf[3 ] &0x80 )) - buf[3 ] |=0x80 ; }else { -if (!(buf[2 ] &0x80 )) - buf[2 ] |=0x80 ; - } +if (cdb[0 ] ==MODE_SENSE_10 ) { +if (!(buf[3 ] &0x80 )) + buf[3 ] |=0x80 ; + }else { +if (!(buf[2 ] &0x80 )) + buf[2 ] |=0x80 ; + } -transport_kunmap_data_sg (cmd); +transport_kunmap_data_sg (cmd); + } } } after_mode_sense:
Signature · 1 line
2.25.1
Quoted 49 lines · Tuo Li
The return value of
transport_kmap_data_sg()is assigned to the variable buf:buf = transport_kmap_data_sg(cmd);And then it is checked:
if (!buf) {This indicates that buf can be NULL. However, it is dereferenced in the following statements:
if (!(buf[3] & 0x80)) buf[3] |= 0x80; if (!(buf[2] & 0x80)) buf[2] |= 0x80;To fix these possible null-pointer dereferences, dereference buf and call
transport_kunmap_data_sg()only when buf is not NULL.Reported-by TOTE Robot <[email protected]>Signed-off-by Tuo Li <[email protected]>---
v2:
* Puttransport_kunmap_data_sg()into the else-branch of the if (!bug). Thank Bodo Stroesser for helpful advice.--- drivers/target/target_core_pscsi.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)drivers/target/target_core_pscsi.c +4
-8@@ -620,17 +620,17 @@ static void pscsi_complete_cmd(struct se_cmd *cmd, u8 scsi_status, buf =transport_kmap_data_sg (cmd);if (!buf) { ;/* XXX: TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE */ - } - -if (cdb[0 ] ==MODE_SENSE_10 ) { -if (!(buf[3 ] &0x80 )) - buf[3 ] |=0x80 ; }else { -if (!(buf[2 ] &0x80 )) - buf[2 ] |=0x80 ; - } +if (cdb[0 ] ==MODE_SENSE_10 ) { +if (!(buf[3 ] &0x80 )) + buf[3 ] |=0x80 ; + }else {
drivers/target/target_core_pscsi.c static void pscsi_complete_cmd(struct se_cmd *cmd, u8 scsi_status, · line 636
Quoted 10 lines
drivers/target/target_core_pscsi.c +5
-1+if (!(buf[2 ] &0x80 )) + buf[2 ] |=0x80 ; + } -transport_kunmap_data_sg (cmd); +transport_kunmap_data_sg (cmd); + } } } after_mode_sense:
Regards,
Bodo
Martin K. Petersen
AppliedTuo,
Quoted 2 lines
The return value of
transport_kmap_data_sg()is assigned to the variable buf:
Applied to 5.15/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 8 lines · Tuo Li
The return value of
transport_kmap_data_sg()is assigned to the variable buf:
buf =transport_kmap_data_sg(cmd);And then it is checked:
if (!buf) {[...]
Applied to 5.15/scsi-queue, thanks!
[1/1] scsi: target: pscsi: Fix possible null-pointer dereference in pscsi_complete_cmd()
https://git.kernel.org/mkp/scsi/c/0f99792c01d1
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering