Commit 6d858350 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Greg Kroah-Hartman

scsi: sg: fix SG_DXFER_FROM_DEV transfers

commit 68c59fce upstream.

SG_DXFER_FROM_DEV transfers do not necessarily have a dxferp as we set
it to NULL for the old sg_io read/write interface, but must have a
length bigger than 0. This fixes a regression introduced by commit
28676d86 ("scsi: sg: check for valid direction before starting the
request")
Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Fixes: 28676d86 ("scsi: sg: check for valid direction before starting the request")
Reported-by: default avatarChris Clayton <chris2553@googlemail.com>
Tested-by: default avatarChris Clayton <chris2553@googlemail.com>
Cc: Douglas Gilbert <dgilbert@interlog.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Tested-by: default avatarChris Clayton <chris2553@googlemail.com>
Acked-by: default avatarDouglas Gilbert <dgilbert@interlog.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Cc: Cristian Crinteanu <crinteanu.cristian@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent abca4633
...@@ -769,8 +769,11 @@ static bool sg_is_valid_dxfer(sg_io_hdr_t *hp) ...@@ -769,8 +769,11 @@ static bool sg_is_valid_dxfer(sg_io_hdr_t *hp)
if (hp->dxferp || hp->dxfer_len > 0) if (hp->dxferp || hp->dxfer_len > 0)
return false; return false;
return true; return true;
case SG_DXFER_TO_DEV:
case SG_DXFER_FROM_DEV: case SG_DXFER_FROM_DEV:
if (hp->dxfer_len < 0)
return false;
return true;
case SG_DXFER_TO_DEV:
case SG_DXFER_TO_FROM_DEV: case SG_DXFER_TO_FROM_DEV:
if (!hp->dxferp || hp->dxfer_len == 0) if (!hp->dxferp || hp->dxfer_len == 0)
return false; return false;
......
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