Commit 68c59fce authored Jul 07, 2017 by Johannes Thumshirn Committed by Martin K. Petersen Jul 12, 2017

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
28676d86 ("scsi: sg: check for valid direction before starting the
request")

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Fixes: 28676d86 ("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>

parent a680f1d4

drivers/scsi/sg.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -758,8 +758,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;

Admin message