stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* FAILED: patch "[PATCH] USB: serial: ti_usb_3410_5052: fix array underflow in" failed to apply to 4.4-stable tree
@ 2018-09-23 19:25 gregkh
  2018-09-24  7:19 ` [PATCH stable-4.4] USB: serial: ti_usb_3410_5052: fix array underflow in completion handler Johan Hovold
  0 siblings, 1 reply; 3+ messages in thread
From: gregkh @ 2018-09-23 19:25 UTC (permalink / raw)
  To: johan, stable; +Cc: stable


The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

>From 5dfdd24eb3d39d815bc952ae98128e967c9bba49 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@kernel.org>
Date: Tue, 21 Aug 2018 11:59:53 +0200
Subject: [PATCH] USB: serial: ti_usb_3410_5052: fix array underflow in
 completion handler

Similarly to a recently reported bug in io_ti, a malicious USB device
could set port_number to a negative value and we would underflow the
port array in the interrupt completion handler.

As these devices only have one or two ports, fix this by making sure we
only consider the seventh bit when determining the port number (and
ignore bits 0xb0 which are typically set to 0x30).

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>

diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 3010878f7f8e..e3c5832337e0 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -1119,7 +1119,7 @@ static void ti_break(struct tty_struct *tty, int break_state)
 
 static int ti_get_port_from_code(unsigned char code)
 {
-	return (code >> 4) - 3;
+	return (code >> 6) & 0x01;
 }
 
 static int ti_get_func_from_code(unsigned char code)

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH stable-4.4] USB: serial: ti_usb_3410_5052: fix array underflow in completion handler
  2018-09-23 19:25 FAILED: patch "[PATCH] USB: serial: ti_usb_3410_5052: fix array underflow in" failed to apply to 4.4-stable tree gregkh
@ 2018-09-24  7:19 ` Johan Hovold
  2018-09-24  7:28   ` Greg Kroah-Hartman
  0 siblings, 1 reply; 3+ messages in thread
From: Johan Hovold @ 2018-09-24  7:19 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: Johan Hovold, stable

commit 5dfdd24eb3d39d815bc952ae98128e967c9bba49 upstream.

Similarly to a recently reported bug in io_ti, a malicious USB device
could set port_number to a negative value and we would underflow the
port array in the interrupt completion handler.

As these devices only have one or two ports, fix this by making sure we
only consider the seventh bit when determining the port number (and
ignore bits 0xb0 which are typically set to 0x30).

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/usb/serial/ti_usb_3410_5052.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/serial/ti_usb_3410_5052.h b/drivers/usb/serial/ti_usb_3410_5052.h
index 98f35c656c02..0cd247f75b8b 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.h
+++ b/drivers/usb/serial/ti_usb_3410_5052.h
@@ -227,7 +227,7 @@ struct ti_interrupt {
 } __attribute__((packed));
 
 /* Interrupt codes */
-#define TI_GET_PORT_FROM_CODE(c)	(((c) >> 4) - 3)
+#define TI_GET_PORT_FROM_CODE(c)	(((c) >> 6) & 0x01)
 #define TI_GET_FUNC_FROM_CODE(c)	((c) & 0x0f)
 #define TI_CODE_HARDWARE_ERROR		0xFF
 #define TI_CODE_DATA_ERROR		0x03
-- 
2.19.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH stable-4.4] USB: serial: ti_usb_3410_5052: fix array underflow in completion handler
  2018-09-24  7:19 ` [PATCH stable-4.4] USB: serial: ti_usb_3410_5052: fix array underflow in completion handler Johan Hovold
@ 2018-09-24  7:28   ` Greg Kroah-Hartman
  0 siblings, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2018-09-24  7:28 UTC (permalink / raw)
  To: Johan Hovold; +Cc: stable

On Mon, Sep 24, 2018 at 09:19:17AM +0200, Johan Hovold wrote:
> commit 5dfdd24eb3d39d815bc952ae98128e967c9bba49 upstream.
> 
> Similarly to a recently reported bug in io_ti, a malicious USB device
> could set port_number to a negative value and we would underflow the
> port array in the interrupt completion handler.
> 
> As these devices only have one or two ports, fix this by making sure we
> only consider the seventh bit when determining the port number (and
> ignore bits 0xb0 which are typically set to 0x30).
> 
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Cc: stable <stable@vger.kernel.org>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
>  drivers/usb/serial/ti_usb_3410_5052.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks, now queued up.

greg k-h

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-09-24 13:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-23 19:25 FAILED: patch "[PATCH] USB: serial: ti_usb_3410_5052: fix array underflow in" failed to apply to 4.4-stable tree gregkh
2018-09-24  7:19 ` [PATCH stable-4.4] USB: serial: ti_usb_3410_5052: fix array underflow in completion handler Johan Hovold
2018-09-24  7:28   ` Greg Kroah-Hartman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).