Commit 6d310dfb authored by Colin Ian King's avatar Colin Ian King Committed by Christoph Hellwig

scsi_debug: test always evaluates to false, || should be used instead

cppcheck found the following issue:
(warning) Logical conjunction always evaluates to false:
  alloc_len < 4 && alloc_len > 65535.

..the test should be instead:

  if (alloc_len < 4 || alloc_len > 65536)

This error was introduced by recent commit 38d5c833
("scsi_debug: add Report supported opcodes+tmfs; Compare and write")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Acked-by: default avatarDouglas Gilbert <dgilbert@interlog.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 91724c20
...@@ -1623,7 +1623,7 @@ resp_rsup_opcodes(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) ...@@ -1623,7 +1623,7 @@ resp_rsup_opcodes(struct scsi_cmnd *scp, struct sdebug_dev_info *devip)
req_opcode = cmd[3]; req_opcode = cmd[3];
req_sa = get_unaligned_be16(cmd + 4); req_sa = get_unaligned_be16(cmd + 4);
alloc_len = get_unaligned_be32(cmd + 6); alloc_len = get_unaligned_be32(cmd + 6);
if (alloc_len < 4 && alloc_len > 0xffff) { if (alloc_len < 4 || alloc_len > 0xffff) {
mk_sense_invalid_fld(scp, SDEB_IN_CDB, 6, -1); mk_sense_invalid_fld(scp, SDEB_IN_CDB, 6, -1);
return check_condition_result; return check_condition_result;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment