From: Greg Kroah-Hartman Date: Tue, 26 Feb 2013 00:43:02 +0000 (-0800) Subject: 3.4-stable patches X-Git-Tag: v3.7.10~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ac7b2cd123652908d364064b7221226031312ab;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: sunvdc-fix-off-by-one-in-generic_request.patch --- diff --git a/queue-3.4/series b/queue-3.4/series index 972eaa7e5b5..769ad799225 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -39,3 +39,4 @@ alsa-usb-fix-processing-unit-descriptor-parsers.patch alsa-hda-release-assigned-pin-cvt-at-error-path-of-hdmi_pcm_open.patch alsa-hda-workaround-for-silent-output-on-sony-vaio-vgc-ln51jgb-with-alc889.patch alsa-hda-hdmi-eld-shouldn-t-be-valid-after-unplug.patch +sunvdc-fix-off-by-one-in-generic_request.patch diff --git a/queue-3.4/sunvdc-fix-off-by-one-in-generic_request.patch b/queue-3.4/sunvdc-fix-off-by-one-in-generic_request.patch new file mode 100644 index 00000000000..16dca82340c --- /dev/null +++ b/queue-3.4/sunvdc-fix-off-by-one-in-generic_request.patch @@ -0,0 +1,31 @@ +From de19c2587dbf353b4140043249207ad3c872162a Mon Sep 17 00:00:00 2001 +From: "David S. Miller" +Date: Thu, 14 Feb 2013 11:49:01 -0800 +Subject: sunvdc: Fix off-by-one in generic_request(). + + +From: "David S. Miller" + +[ Upstream commit f4d9605434c0fd4cc8639bf25cfc043418c52362 ] + +The 'operations' bitmap corresponds one-for-one with the operation +codes, no adjustment is necessary. + +Reported-by: Mark Kettenis +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/block/sunvdc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/block/sunvdc.c ++++ b/drivers/block/sunvdc.c +@@ -461,7 +461,7 @@ static int generic_request(struct vdc_po + int op_len, err; + void *req_buf; + +- if (!(((u64)1 << ((u64)op - 1)) & port->operations)) ++ if (!(((u64)1 << (u64)op) & port->operations)) + return -EOPNOTSUPP; + + switch (op) {