Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp227808ybg; Thu, 17 Oct 2019 21:59:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqyE5uolAb8oxZ+FYlMwek0ABUdRuCfgm6uo6MaQXuQzjl0XWjgANWhjNdCQkHQhbSaO+hDp X-Received: by 2002:aa7:d3d3:: with SMTP id o19mr7421847edr.230.1571374752770; Thu, 17 Oct 2019 21:59:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571374752; cv=none; d=google.com; s=arc-20160816; b=AqlIbJLb7BsysDzZmD+ZUCQ80wm/TERYLSOVS23Vr4ICm/4c0CeEXteBOJHu6UaDdZ ZfnKFkFYYAmpPsGneDDo8AzVmQjILd/w8dGwi/sjgW5s4rnWJvcgbkDIkbzk5WU+oevy W9jvvHg2i8WvtrnVv2I3M/Rzz2YF0MFaHSWRib6Nz+9Tf57/nF9+aSwlD1fQk2rK02NU b0uMXOOfGGpYsJH62e39n7OLb0bmtJF1UrH8p6Y3nfXRXl+wZALTdTcbtxAMdwQ2Oi64 /iepDaknS5mRxlAM1l7iJsAxvZv0xZIFzNWXKyhLD+nHP305kTqKP14ZMCodTzjI5oW2 urWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RI8tUhYdVY8K5GyxeBzizHE8OgbqyBaX8OeTuUcgM64=; b=CBrpaVhR8FlcuMGoYynMETbp3yK8NS3le8IIx/7Bd3Z7xsZVVXoMvSVICo3CZUQshi Q3eVqge+paEsq917gW1R3scbUk/RC9wox7+CRMTx8GlrJThu1evu9w9Q8iiQCI0sxj5S 54FZJ/+5CmHoRHbbgeyfCCxjWj5IUPlybXkL44rQorJ9m+uI0VOaDK1nDTW1R0agX/fC uP8Xn1FV4Poiy3UhCzdir0J99VFlNETjUXa7dqlS0ABxWlR8w7nQYV27tuWbit0eGBC7 wm9mWO1FcZuz/fdJ9nVobivf56lENDxM9Q0FGv2QXP1vTF6iIfHykSsgA1pJ2EhzOU+y pbrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LYC8Nl4f; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b27si2987344ede.233.2019.10.17.21.58.08; Thu, 17 Oct 2019 21:59:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LYC8Nl4f; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407471AbfJPWQQ (ORCPT + 99 others); Wed, 16 Oct 2019 18:16:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:45616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395205AbfJPVzM (ORCPT ); Wed, 16 Oct 2019 17:55:12 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9D6D6218DE; Wed, 16 Oct 2019 21:55:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262910; bh=i+gKiRn87lEk5Jrzw3giYNZt2flWmtf0ST2A5VtVbxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LYC8Nl4fPEFfKfrh8a5u/lzUf56LQAH+HFONO88Di2V5jpvmrQLU9rKM0zgesEuiy bl05LNfTfj4CPuoXg1bX2JiD2WROVL6AI/IQysW0AEXi7z3lF+HSYMw4KFfyrRILSL AiU/6Xu5jeojv7lDnosKTB8oqdiyMI57Rxh2AN0A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold Subject: [PATCH 4.9 70/92] USB: legousbtower: fix potential NULL-deref on disconnect Date: Wed, 16 Oct 2019 14:50:43 -0700 Message-Id: <20191016214843.945253810@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214759.600329427@linuxfoundation.org> References: <20191016214759.600329427@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johan Hovold commit cd81e6fa8e033e7bcd59415b4a65672b4780030b upstream. The driver is using its struct usb_device pointer as an inverted disconnected flag, but was setting it to NULL before making sure all completion handlers had run. This could lead to a NULL-pointer dereference in a number of dev_dbg and dev_err statements in the completion handlers which relies on said pointer. Fix this by unconditionally stopping all I/O and preventing resubmissions by poisoning the interrupt URBs at disconnect and using a dedicated disconnected flag. This also makes sure that all I/O has completed by the time the disconnect callback returns. Fixes: 9d974b2a06e3 ("USB: legousbtower.c: remove err() usage") Fixes: fef526cae700 ("USB: legousbtower: remove custom debug macro") Fixes: 4dae99638097 ("USB: legotower: remove custom debug macro and module parameter") Cc: stable # 3.5 Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20190919083039.30898-4-johan@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/misc/legousbtower.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) --- a/drivers/usb/misc/legousbtower.c +++ b/drivers/usb/misc/legousbtower.c @@ -196,6 +196,7 @@ struct lego_usb_tower { unsigned char minor; /* the starting minor number for this device */ int open_count; /* number of times this port has been opened */ + unsigned long disconnected:1; char* read_buffer; size_t read_buffer_length; /* this much came in */ @@ -295,8 +296,6 @@ static inline void lego_usb_tower_debug_ */ static inline void tower_delete (struct lego_usb_tower *dev) { - tower_abort_transfers (dev); - /* free data structures */ usb_free_urb(dev->interrupt_in_urb); usb_free_urb(dev->interrupt_out_urb); @@ -436,7 +435,8 @@ static int tower_release (struct inode * retval = -ENODEV; goto unlock_exit; } - if (dev->udev == NULL) { + + if (dev->disconnected) { /* the device was unplugged before the file was released */ /* unlock here as tower_delete frees dev */ @@ -472,10 +472,9 @@ static void tower_abort_transfers (struc if (dev->interrupt_in_running) { dev->interrupt_in_running = 0; mb(); - if (dev->udev) - usb_kill_urb (dev->interrupt_in_urb); + usb_kill_urb(dev->interrupt_in_urb); } - if (dev->interrupt_out_busy && dev->udev) + if (dev->interrupt_out_busy) usb_kill_urb(dev->interrupt_out_urb); } @@ -511,7 +510,7 @@ static unsigned int tower_poll (struct f dev = file->private_data; - if (!dev->udev) + if (dev->disconnected) return POLLERR | POLLHUP; poll_wait(file, &dev->read_wait, wait); @@ -558,7 +557,7 @@ static ssize_t tower_read (struct file * } /* verify that the device wasn't unplugged */ - if (dev->udev == NULL) { + if (dev->disconnected) { retval = -ENODEV; pr_err("No device or device unplugged %d\n", retval); goto unlock_exit; @@ -644,7 +643,7 @@ static ssize_t tower_write (struct file } /* verify that the device wasn't unplugged */ - if (dev->udev == NULL) { + if (dev->disconnected) { retval = -ENODEV; pr_err("No device or device unplugged %d\n", retval); goto unlock_exit; @@ -753,7 +752,7 @@ static void tower_interrupt_in_callback resubmit: /* resubmit if we're still running */ - if (dev->interrupt_in_running && dev->udev) { + if (dev->interrupt_in_running) { retval = usb_submit_urb (dev->interrupt_in_urb, GFP_ATOMIC); if (retval) dev_err(&dev->udev->dev, @@ -821,6 +820,7 @@ static int tower_probe (struct usb_inter dev->udev = udev; dev->open_count = 0; + dev->disconnected = 0; dev->read_buffer = NULL; dev->read_buffer_length = 0; @@ -958,6 +958,10 @@ static void tower_disconnect (struct usb /* give back our minor and prevent further open() */ usb_deregister_dev (interface, &tower_class); + /* stop I/O */ + usb_poison_urb(dev->interrupt_in_urb); + usb_poison_urb(dev->interrupt_out_urb); + mutex_lock(&dev->lock); /* if the device is not opened, then we clean up right now */ @@ -965,7 +969,7 @@ static void tower_disconnect (struct usb mutex_unlock(&dev->lock); tower_delete (dev); } else { - dev->udev = NULL; + dev->disconnected = 1; /* wake up pollers */ wake_up_interruptible_all(&dev->read_wait); wake_up_interruptible_all(&dev->write_wait);