remove usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch

diff --git a/queue-4.10/series b/queue-4.10/series
index 903592973382d9172e5ae2b1235da5886d43298a..14e17904f2f12667fe4080269ea957cc2f152b6e 100644 (file)
--- a/queue-4.10/series
+++ b/queue-4.10/series
@@ -7,7 +7,6 @@ usb-serial-cp210x-add-new-ids-for-ge-bx50v3-boards.patch
 usb-serial-ftdi_sio-fix-modem-status-error-handling.patch
 usb-serial-ftdi_sio-fix-extreme-low-latency-setting.patch
 usb-serial-ftdi_sio-fix-line-status-over-reporting.patch
-usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch
 usb-serial-spcp8x5-fix-modem-status-handling.patch
 usb-serial-opticon-fix-cts-retrieval-at-open.patch
 usb-serial-ark3116-fix-register-accessor-error-handling.patch

diff --git a/queue-4.10/usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch b/queue-4.10/usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch
deleted file mode 100644 (file)
index 22c2761..0000000
--- a/queue-4.10/usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2d380889215fe20b8523345649dee0579821800c Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Tue, 31 Jan 2017 17:17:27 +0100
-Subject: USB: serial: digi_acceleport: fix OOB data sanity check
-
-From: Johan Hovold <johan@kernel.org>
-
-commit 2d380889215fe20b8523345649dee0579821800c upstream.
-
-Make sure to check for short transfers to avoid underflow in a loop
-condition when parsing the receive buffer.
-
-Also fix an off-by-one error in the incomplete sanity check which could
-lead to invalid data being parsed.
-
-Fixes: 8c209e6782ca ("USB: make actual_length in struct urb field u32")
-Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
-Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/serial/digi_acceleport.c |   14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
---- a/drivers/usb/serial/digi_acceleport.c
-+++ b/drivers/usb/serial/digi_acceleport.c
-@@ -1482,16 +1482,20 @@ static int digi_read_oob_callback(struct
-       struct usb_serial *serial = port->serial;
-       struct tty_struct *tty;
-       struct digi_port *priv = usb_get_serial_port_data(port);
-+      unsigned char *buf = urb->transfer_buffer;
-       int opcode, line, status, val;
-       int i;
-       unsigned int rts;
- 
-+      if (urb->actual_length < 4)
-+              return -1;
-+
-       /* handle each oob command */
--      for (i = 0; i < urb->actual_length - 3;) {
--              opcode = ((unsigned char *)urb->transfer_buffer)[i++];
--              line = ((unsigned char *)urb->transfer_buffer)[i++];
--              status = ((unsigned char *)urb->transfer_buffer)[i++];
--              val = ((unsigned char *)urb->transfer_buffer)[i++];
-+      for (i = 0; i < urb->actual_length - 4; i += 4) {
-+              opcode = buf[i];
-+              line = buf[i + 1];
-+              status = buf[i + 2];
-+              val = buf[i + 3];
- 
-               dev_dbg(&port->dev, "digi_read_oob_callback: opcode=%d, line=%d, status=%d, val=%d\n",
-                       opcode, line, status, val);

diff --git a/queue-4.4/series b/queue-4.4/series
index 9d5a7d2d2616ea5a5f5701b1ed9dc4ebd4cf9db6..a55535f225201abc5f0c66d0b06197fa54a70849 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -14,7 +14,6 @@ usb-serial-cp210x-add-new-ids-for-ge-bx50v3-boards.patch
 usb-serial-ftdi_sio-fix-modem-status-error-handling.patch
 usb-serial-ftdi_sio-fix-extreme-low-latency-setting.patch
 usb-serial-ftdi_sio-fix-line-status-over-reporting.patch
-usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch
 usb-serial-spcp8x5-fix-modem-status-handling.patch
 usb-serial-opticon-fix-cts-retrieval-at-open.patch
 usb-serial-ark3116-fix-register-accessor-error-handling.patch

diff --git a/queue-4.4/usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch b/queue-4.4/usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch
deleted file mode 100644 (file)
index bdef7a7..0000000
--- a/queue-4.4/usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2d380889215fe20b8523345649dee0579821800c Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Tue, 31 Jan 2017 17:17:27 +0100
-Subject: USB: serial: digi_acceleport: fix OOB data sanity check
-
-From: Johan Hovold <johan@kernel.org>
-
-commit 2d380889215fe20b8523345649dee0579821800c upstream.
-
-Make sure to check for short transfers to avoid underflow in a loop
-condition when parsing the receive buffer.
-
-Also fix an off-by-one error in the incomplete sanity check which could
-lead to invalid data being parsed.
-
-Fixes: 8c209e6782ca ("USB: make actual_length in struct urb field u32")
-Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
-Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/serial/digi_acceleport.c |   14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
---- a/drivers/usb/serial/digi_acceleport.c
-+++ b/drivers/usb/serial/digi_acceleport.c
-@@ -1483,16 +1483,20 @@ static int digi_read_oob_callback(struct
-       struct usb_serial *serial = port->serial;
-       struct tty_struct *tty;
-       struct digi_port *priv = usb_get_serial_port_data(port);
-+      unsigned char *buf = urb->transfer_buffer;
-       int opcode, line, status, val;
-       int i;
-       unsigned int rts;
- 
-+      if (urb->actual_length < 4)
-+              return -1;
-+
-       /* handle each oob command */
--      for (i = 0; i < urb->actual_length - 3;) {
--              opcode = ((unsigned char *)urb->transfer_buffer)[i++];
--              line = ((unsigned char *)urb->transfer_buffer)[i++];
--              status = ((unsigned char *)urb->transfer_buffer)[i++];
--              val = ((unsigned char *)urb->transfer_buffer)[i++];
-+      for (i = 0; i < urb->actual_length - 4; i += 4) {
-+              opcode = buf[i];
-+              line = buf[i + 1];
-+              status = buf[i + 2];
-+              val = buf[i + 3];
- 
-               dev_dbg(&port->dev, "digi_read_oob_callback: opcode=%d, line=%d, status=%d, val=%d\n",
-                       opcode, line, status, val);

diff --git a/queue-4.9/series b/queue-4.9/series
index 0e2df40a17c8530103b6641235285b75183a5222..7deebef35f0c164da47b1c3159bc865f236e161a 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -18,7 +18,6 @@ usb-serial-cp210x-add-new-ids-for-ge-bx50v3-boards.patch
 usb-serial-ftdi_sio-fix-modem-status-error-handling.patch
 usb-serial-ftdi_sio-fix-extreme-low-latency-setting.patch
 usb-serial-ftdi_sio-fix-line-status-over-reporting.patch
-usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch
 usb-serial-spcp8x5-fix-modem-status-handling.patch
 usb-serial-opticon-fix-cts-retrieval-at-open.patch
 usb-serial-ark3116-fix-register-accessor-error-handling.patch

diff --git a/queue-4.9/usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch b/queue-4.9/usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch
deleted file mode 100644 (file)
index 22c2761..0000000
--- a/queue-4.9/usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2d380889215fe20b8523345649dee0579821800c Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Tue, 31 Jan 2017 17:17:27 +0100
-Subject: USB: serial: digi_acceleport: fix OOB data sanity check
-
-From: Johan Hovold <johan@kernel.org>
-
-commit 2d380889215fe20b8523345649dee0579821800c upstream.
-
-Make sure to check for short transfers to avoid underflow in a loop
-condition when parsing the receive buffer.
-
-Also fix an off-by-one error in the incomplete sanity check which could
-lead to invalid data being parsed.
-
-Fixes: 8c209e6782ca ("USB: make actual_length in struct urb field u32")
-Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
-Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/serial/digi_acceleport.c |   14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
---- a/drivers/usb/serial/digi_acceleport.c
-+++ b/drivers/usb/serial/digi_acceleport.c
-@@ -1482,16 +1482,20 @@ static int digi_read_oob_callback(struct
-       struct usb_serial *serial = port->serial;
-       struct tty_struct *tty;
-       struct digi_port *priv = usb_get_serial_port_data(port);
-+      unsigned char *buf = urb->transfer_buffer;
-       int opcode, line, status, val;
-       int i;
-       unsigned int rts;
- 
-+      if (urb->actual_length < 4)
-+              return -1;
-+
-       /* handle each oob command */
--      for (i = 0; i < urb->actual_length - 3;) {
--              opcode = ((unsigned char *)urb->transfer_buffer)[i++];
--              line = ((unsigned char *)urb->transfer_buffer)[i++];
--              status = ((unsigned char *)urb->transfer_buffer)[i++];
--              val = ((unsigned char *)urb->transfer_buffer)[i++];
-+      for (i = 0; i < urb->actual_length - 4; i += 4) {
-+              opcode = buf[i];
-+              line = buf[i + 1];
-+              status = buf[i + 2];
-+              val = buf[i + 3];
- 
-               dev_dbg(&port->dev, "digi_read_oob_callback: opcode=%d, line=%d, status=%d, val=%d\n",
-                       opcode, line, status, val);