From 6352af6e63455065d3e5e53124106354328dcdc9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 11 Aug 2017 08:30:13 -0700 Subject: [PATCH] drop scsi-sg-fix-sg_dxfer_from_dev-transfers.patch from 4.12 --- ...i-sg-fix-sg_dxfer_from_dev-transfers.patch | 45 ------------------- queue-4.12/series | 1 - 2 files changed, 46 deletions(-) delete mode 100644 queue-4.12/scsi-sg-fix-sg_dxfer_from_dev-transfers.patch diff --git a/queue-4.12/scsi-sg-fix-sg_dxfer_from_dev-transfers.patch b/queue-4.12/scsi-sg-fix-sg_dxfer_from_dev-transfers.patch deleted file mode 100644 index f18b5096d62..00000000000 --- a/queue-4.12/scsi-sg-fix-sg_dxfer_from_dev-transfers.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 68c59fcea1f2c6a54c62aa896cc623c1b5bc9b47 Mon Sep 17 00:00:00 2001 -From: Johannes Thumshirn -Date: Fri, 7 Jul 2017 10:56:38 +0200 -Subject: scsi: sg: fix SG_DXFER_FROM_DEV transfers - -From: Johannes Thumshirn - -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 -Fixes: 28676d869bbb ("scsi: sg: check for valid direction before starting the request") -Reported-by: Chris Clayton -Tested-by: Chris Clayton -Cc: Douglas Gilbert -Reviewed-by: Hannes Reinecke -Tested-by: Chris Clayton -Acked-by: Douglas Gilbert -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/scsi/sg.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/scsi/sg.c -+++ b/drivers/scsi/sg.c -@@ -758,8 +758,11 @@ static bool sg_is_valid_dxfer(sg_io_hdr_ - 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; diff --git a/queue-4.12/series b/queue-4.12/series index e1e19c9af34..914e583bd75 100644 --- a/queue-4.12/series +++ b/queue-4.12/series @@ -1,7 +1,6 @@ parisc-increase-thread-and-stack-size-to-32kb.patch parisc-handle-vma-s-whose-context-is-not-current-in-flush_cache_range.patch scsi-lpfc-fix-linking-against-modular-nvme-support.patch -scsi-sg-fix-sg_dxfer_from_dev-transfers.patch acpi-lpss-only-call-pwm_add_table-for-the-first-pwm-controller.patch cgroup-don-t-call-migration-methods-if-there-are-no-tasks-to-migrate.patch cgroup-create-dfl_root-files-on-subsys-registration.patch -- 2.47.3