* [PATCH 0/2] USB: serial: console: fix two use-after-free bugs
@ 2017-10-04 9:01 Johan Hovold
2017-10-04 9:01 ` [PATCH 1/2] USB: serial: console: fix use-after-free on disconnect Johan Hovold
2017-10-04 9:01 ` [PATCH 2/2] USB: serial: console: fix use-after-free after failed setup Johan Hovold
0 siblings, 2 replies; 9+ messages in thread
From: Johan Hovold @ 2017-10-04 9:01 UTC (permalink / raw)
To: linux-usb; +Cc: Andrey Konovalov, linux-kernel, Johan Hovold
A recent clean-up patch of mine did more than intended and introduced
the potential for a use-after-free on disconnect under some very
specific circumstances. Fortunately those circumstances were not obscure
enough to prevent Andrey's fuzzing from triggering the bug.
While fixing this one I found a related issue through inspection which
dates back to 2006.
Johan
Johan Hovold (2):
USB: serial: console: fix use-after-free on disconnect
USB: serial: console: fix use-after-free after failed setup
drivers/usb/serial/console.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
2.14.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] USB: serial: console: fix use-after-free on disconnect
2017-10-04 9:01 [PATCH 0/2] USB: serial: console: fix two use-after-free bugs Johan Hovold
@ 2017-10-04 9:01 ` Johan Hovold
2017-10-04 14:39 ` Greg KH
` (2 more replies)
2017-10-04 9:01 ` [PATCH 2/2] USB: serial: console: fix use-after-free after failed setup Johan Hovold
1 sibling, 3 replies; 9+ messages in thread
From: Johan Hovold @ 2017-10-04 9:01 UTC (permalink / raw)
To: linux-usb; +Cc: Andrey Konovalov, linux-kernel, Johan Hovold, stable
A clean-up patch removing removing two redundant NULL-checks from the
console disconnect handler inadvertently also removed a third check.
This could lead to the struct usb_serial being prematurely freed by the
console code when a driver accepts but does not register any ports for
an interface which also lacks endpoint descriptors.
Fixes: 0e517c93dc02 ("USB: serial: console: clean up sanity checks")
Cc: stable <stable@vger.kernel.org> # 4.11
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/usb/serial/console.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index fdf89800ebc3..ed8ba3ef5c79 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -265,7 +265,7 @@ static struct console usbcons = {
void usb_serial_console_disconnect(struct usb_serial *serial)
{
- if (serial->port[0] == usbcons_info.port) {
+ if (serial->port[0] && serial->port[0] == usbcons_info.port) {
usb_serial_console_exit();
usb_serial_put(serial);
}
--
2.14.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/2] USB: serial: console: fix use-after-free on disconnect
2017-10-04 9:01 ` [PATCH 1/2] USB: serial: console: fix use-after-free on disconnect Johan Hovold
@ 2017-10-04 14:39 ` Greg KH
2017-10-07 8:56 ` Jaejoong Kim
2017-10-09 11:05 ` Andrey Konovalov
2 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2017-10-04 14:39 UTC (permalink / raw)
To: Johan Hovold; +Cc: linux-usb, Andrey Konovalov, linux-kernel, stable
On Wed, Oct 04, 2017 at 11:01:12AM +0200, Johan Hovold wrote:
> A clean-up patch removing removing two redundant NULL-checks from the
> console disconnect handler inadvertently also removed a third check.
> This could lead to the struct usb_serial being prematurely freed by the
> console code when a driver accepts but does not register any ports for
> an interface which also lacks endpoint descriptors.
>
> Fixes: 0e517c93dc02 ("USB: serial: console: clean up sanity checks")
> Cc: stable <stable@vger.kernel.org> # 4.11
> Reported-by: Andrey Konovalov <andreyknvl@google.com>
> Signed-off-by: Johan Hovold <johan@kernel.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/2] USB: serial: console: fix use-after-free on disconnect
2017-10-04 9:01 ` [PATCH 1/2] USB: serial: console: fix use-after-free on disconnect Johan Hovold
2017-10-04 14:39 ` Greg KH
@ 2017-10-07 8:56 ` Jaejoong Kim
2017-10-09 10:41 ` Johan Hovold
2017-10-09 11:05 ` Andrey Konovalov
2 siblings, 1 reply; 9+ messages in thread
From: Jaejoong Kim @ 2017-10-07 8:56 UTC (permalink / raw)
To: Johan Hovold; +Cc: USB list, Andrey Konovalov, LKML, stable
Hi
2017-10-04 18:01 GMT+09:00 Johan Hovold <johan@kernel.org>:
> A clean-up patch removing removing two redundant NULL-checks from the
^^^^^^^^^^^^^^^^^^
The word 'removing' was written twice. :)
> console disconnect handler inadvertently also removed a third check.
> This could lead to the struct usb_serial being prematurely freed by the
> console code when a driver accepts but does not register any ports for
> an interface which also lacks endpoint descriptors.
>
> Fixes: 0e517c93dc02 ("USB: serial: console: clean up sanity checks")
> Cc: stable <stable@vger.kernel.org> # 4.11
> Reported-by: Andrey Konovalov <andreyknvl@google.com>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
> drivers/usb/serial/console.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
> index fdf89800ebc3..ed8ba3ef5c79 100644
> --- a/drivers/usb/serial/console.c
> +++ b/drivers/usb/serial/console.c
> @@ -265,7 +265,7 @@ static struct console usbcons = {
>
> void usb_serial_console_disconnect(struct usb_serial *serial)
> {
> - if (serial->port[0] == usbcons_info.port) {
> + if (serial->port[0] && serial->port[0] == usbcons_info.port) {
> usb_serial_console_exit();
> usb_serial_put(serial);
> }
> --
> 2.14.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/2] USB: serial: console: fix use-after-free on disconnect
2017-10-07 8:56 ` Jaejoong Kim
@ 2017-10-09 10:41 ` Johan Hovold
0 siblings, 0 replies; 9+ messages in thread
From: Johan Hovold @ 2017-10-09 10:41 UTC (permalink / raw)
To: Jaejoong Kim; +Cc: Johan Hovold, USB list, Andrey Konovalov, LKML, stable
On Sat, Oct 07, 2017 at 05:56:17PM +0900, Jaejoong Kim wrote:
> Hi
>
> 2017-10-04 18:01 GMT+09:00 Johan Hovold <johan@kernel.org>:
> > A clean-up patch removing removing two redundant NULL-checks from the
> ^^^^^^^^^^^^^^^^^^
> The word 'removing' was written twice. :)
Thanks for noticing, now fixed up.
Johan
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] USB: serial: console: fix use-after-free on disconnect
2017-10-04 9:01 ` [PATCH 1/2] USB: serial: console: fix use-after-free on disconnect Johan Hovold
2017-10-04 14:39 ` Greg KH
2017-10-07 8:56 ` Jaejoong Kim
@ 2017-10-09 11:05 ` Andrey Konovalov
2017-10-09 11:10 ` Johan Hovold
2 siblings, 1 reply; 9+ messages in thread
From: Andrey Konovalov @ 2017-10-09 11:05 UTC (permalink / raw)
To: Johan Hovold; +Cc: USB list, LKML, stable
On Wed, Oct 4, 2017 at 11:01 AM, Johan Hovold <johan@kernel.org> wrote:
> A clean-up patch removing removing two redundant NULL-checks from the
> console disconnect handler inadvertently also removed a third check.
> This could lead to the struct usb_serial being prematurely freed by the
> console code when a driver accepts but does not register any ports for
> an interface which also lacks endpoint descriptors.
>
> Fixes: 0e517c93dc02 ("USB: serial: console: clean up sanity checks")
> Cc: stable <stable@vger.kernel.org> # 4.11
> Reported-by: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
This fixes the crash.
Thanks!
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
> drivers/usb/serial/console.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
> index fdf89800ebc3..ed8ba3ef5c79 100644
> --- a/drivers/usb/serial/console.c
> +++ b/drivers/usb/serial/console.c
> @@ -265,7 +265,7 @@ static struct console usbcons = {
>
> void usb_serial_console_disconnect(struct usb_serial *serial)
> {
> - if (serial->port[0] == usbcons_info.port) {
> + if (serial->port[0] && serial->port[0] == usbcons_info.port) {
> usb_serial_console_exit();
> usb_serial_put(serial);
> }
> --
> 2.14.2
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/2] USB: serial: console: fix use-after-free on disconnect
2017-10-09 11:05 ` Andrey Konovalov
@ 2017-10-09 11:10 ` Johan Hovold
0 siblings, 0 replies; 9+ messages in thread
From: Johan Hovold @ 2017-10-09 11:10 UTC (permalink / raw)
To: Andrey Konovalov; +Cc: Johan Hovold, USB list, LKML, stable
On Mon, Oct 09, 2017 at 01:05:30PM +0200, Andrey Konovalov wrote:
> On Wed, Oct 4, 2017 at 11:01 AM, Johan Hovold <johan@kernel.org> wrote:
> > A clean-up patch removing removing two redundant NULL-checks from the
> > console disconnect handler inadvertently also removed a third check.
> > This could lead to the struct usb_serial being prematurely freed by the
> > console code when a driver accepts but does not register any ports for
> > an interface which also lacks endpoint descriptors.
> >
> > Fixes: 0e517c93dc02 ("USB: serial: console: clean up sanity checks")
> > Cc: stable <stable@vger.kernel.org> # 4.11
> > Reported-by: Andrey Konovalov <andreyknvl@google.com>
>
> Tested-by: Andrey Konovalov <andreyknvl@google.com>
>
> This fixes the crash.
I just forwarded this one in a pull-request to Greg, but thanks for
testing nonetheless.
Johan
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] USB: serial: console: fix use-after-free after failed setup
2017-10-04 9:01 [PATCH 0/2] USB: serial: console: fix two use-after-free bugs Johan Hovold
2017-10-04 9:01 ` [PATCH 1/2] USB: serial: console: fix use-after-free on disconnect Johan Hovold
@ 2017-10-04 9:01 ` Johan Hovold
2017-10-04 14:39 ` Greg KH
1 sibling, 1 reply; 9+ messages in thread
From: Johan Hovold @ 2017-10-04 9:01 UTC (permalink / raw)
To: linux-usb; +Cc: Andrey Konovalov, linux-kernel, Johan Hovold, stable
Make sure to reset the USB-console port pointer when console setup fails
in order to avoid having the struct usb_serial be prematurely freed by
the console code when the device is later disconnected.
Fixes: 73e487fdb75f ("[PATCH] USB console: fix disconnection issues")
Cc: stable <stable@vger.kernel.org> # 2.6.18
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/usb/serial/console.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index ed8ba3ef5c79..43a862a90a77 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -186,6 +186,7 @@ static int usb_console_setup(struct console *co, char *options)
tty_kref_put(tty);
reset_open_count:
port->port.count = 0;
+ info->port = NULL;
usb_autopm_put_interface(serial->interface);
error_get_interface:
usb_serial_put(serial);
--
2.14.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-10-09 11:10 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-04 9:01 [PATCH 0/2] USB: serial: console: fix two use-after-free bugs Johan Hovold
2017-10-04 9:01 ` [PATCH 1/2] USB: serial: console: fix use-after-free on disconnect Johan Hovold
2017-10-04 14:39 ` Greg KH
2017-10-07 8:56 ` Jaejoong Kim
2017-10-09 10:41 ` Johan Hovold
2017-10-09 11:05 ` Andrey Konovalov
2017-10-09 11:10 ` Johan Hovold
2017-10-04 9:01 ` [PATCH 2/2] USB: serial: console: fix use-after-free after failed setup Johan Hovold
2017-10-04 14:39 ` Greg KH
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).