From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752354AbdJDJCe (ORCPT ); Wed, 4 Oct 2017 05:02:34 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:33442 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751963AbdJDJB7 (ORCPT ); Wed, 4 Oct 2017 05:01:59 -0400 X-Google-Smtp-Source: AOwi7QCa5U4dZSlZ1WI8/pYjukP+llZ/Wk3IAoAalwbetc1B8Ni3vGFxly8SBYXuy46b4ant899GEg== From: Johan Hovold To: linux-usb@vger.kernel.org Cc: Andrey Konovalov , linux-kernel@vger.kernel.org, Johan Hovold , stable Subject: [PATCH 1/2] USB: serial: console: fix use-after-free on disconnect Date: Wed, 4 Oct 2017 11:01:12 +0200 Message-Id: <20171004090113.24218-2-johan@kernel.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171004090113.24218-1-johan@kernel.org> References: <20171004090113.24218-1-johan@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 # 4.11 Reported-by: Andrey Konovalov Signed-off-by: Johan Hovold --- 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