Skip to content

Commit fd3fc0b

Browse files
Johannes Thumshirntorvalds
authored andcommitted
scsi: don't BUG_ON() empty DMA transfers
Don't crash the machine just because of an empty transfer. Use WARN_ON() combined with returning an error. Found by Dmitry Vyukov and syzkaller. [ Changed to "WARN_ON_ONCE()". Al has a patch that should fix the root cause, but a BUG_ON() is not acceptable in any case, and a WARN_ON() might still be a cause of excessive log spamming. NOTE! If this warning ever triggers, we may end up leaking resources, since this doesn't bother to try to clean the command up. So this WARN_ON_ONCE() triggering does imply real problems. But BUG_ON() is much worse. People really need to stop using BUG_ON() for "this shouldn't ever happen". It makes pretty much any bug worse. - Linus ] Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> Reported-by: Dmitry Vyukov <dvyukov@google.com> Cc: James Bottomley <jejb@linux.vnet.ibm.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 00ea1ce commit fd3fc0b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/scsi/scsi_lib.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,8 @@ int scsi_init_io(struct scsi_cmnd *cmd)
10401040
bool is_mq = (rq->mq_ctx != NULL);
10411041
int error;
10421042

1043-
BUG_ON(!blk_rq_nr_phys_segments(rq));
1043+
if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq)))
1044+
return -EINVAL;
10441045

10451046
error = scsi_init_sgtable(rq, &cmd->sdb);
10461047
if (error)

0 commit comments

Comments
 (0)