Skip to content

Commit 68c59fc

Browse files
Johannes Thumshirnmartinkpetersen
authored andcommitted
scsi: sg: fix SG_DXFER_FROM_DEV transfers
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 28676d8 ("scsi: sg: check for valid direction before starting the request") Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> Fixes: 28676d8 ("scsi: sg: check for valid direction before starting the request") Reported-by: Chris Clayton <chris2553@googlemail.com> Tested-by: Chris Clayton <chris2553@googlemail.com> Cc: Douglas Gilbert <dgilbert@interlog.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Tested-by: Chris Clayton <chris2553@googlemail.com> Acked-by: Douglas Gilbert <dgilbert@interlog.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent a680f1d commit 68c59fc

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/scsi/sg.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,8 +758,11 @@ static bool sg_is_valid_dxfer(sg_io_hdr_t *hp)
758758
if (hp->dxferp || hp->dxfer_len > 0)
759759
return false;
760760
return true;
761-
case SG_DXFER_TO_DEV:
762761
case SG_DXFER_FROM_DEV:
762+
if (hp->dxfer_len < 0)
763+
return false;
764+
return true;
765+
case SG_DXFER_TO_DEV:
763766
case SG_DXFER_TO_FROM_DEV:
764767
if (!hp->dxferp || hp->dxfer_len == 0)
765768
return false;

0 commit comments

Comments
 (0)