diff options
| author |   Johannes Thumshirn <jthumshirn@suse.de> | 2017-07-07 10:56:38 +0200 |
|---|---|---|
| committer |   Ben Hutchings <ben@decadent.org.uk> | 2020-06-11 19:05:49 +0100 |
| commit | 341068a66ab680ab19b4938253b872ca00ec8121 (patch) | |
| tree | 1c3466e399dee233e43b4284fdd0272247c9960a | |
| parent | scsi: sg: close race condition in sg_remove_sfp_usercontext() (diff) | |
| download | linux-stable-341068a66ab680ab19b4938253b872ca00ec8121.tar.xz linux-stable-341068a66ab680ab19b4938253b872ca00ec8121.zip | |
scsi: sg: fix SG_DXFER_FROM_DEV transfers
commit 68c59fcea1f2c6a54c62aa896cc623c1b5bc9b47 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
28676d869bbb ("scsi: sg: check for valid direction before starting the
request")
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Fixes: 28676d869bbb ("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>
Cc: Cristian Crinteanu <crinteanu.cristian@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/scsi/sg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 4a1a0d74a51f..59c33205ade3 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -795,8 +795,11 @@ static bool sg_is_valid_dxfer(sg_io_hdr_t *hp) if (hp->dxferp || hp->dxfer_len > 0) return false; return true; - case SG_DXFER_TO_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: if (!hp->dxferp || hp->dxfer_len == 0) return false; |