Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 6a16d7be932a9df1024836ccbb448de73afd3dd0

Authored by Roland Dreier
Committed by Nicholas Bellinger
1 parent 2d15025a56
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

target: Fix missing length check in spc_emulate_evpd_83() 

Commit fbfe858fea2a ("target_core_spc: Include target device
descriptor in VPD page 83") added a new length variable, but (due to a
cut and paste mistake?) just checks scsi_name_len against 256 twice.
Fix this to check scsi_target_len for overflow too.

Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/target/target_core_spc.c
Diff comments   View file @ 6a16d7b
... ... @@ -440,8 +440,8 @@
440 440 padding = ((-scsi_target_len) & 3);
441 441 if (padding)
442 442 scsi_target_len += padding;
443   - if (scsi_name_len > 256)
444   - scsi_name_len = 256;
  443 + if (scsi_target_len > 256)
  444 + scsi_target_len = 256;
445 445  
446 446 buf[off-1] = scsi_target_len;
447 447 off += scsi_target_len;