Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1049940ybp; Thu, 17 Oct 2019 07:21:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqzubN7AF/R7YJf0P5bHQfPwTr4Q+NufjJg7wtBu0YhpuLOT5BYiCtbo3mwyb0iqOzkUjgan X-Received: by 2002:aa7:d045:: with SMTP id n5mr4107056edo.24.1571322079597; Thu, 17 Oct 2019 07:21:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571322079; cv=none; d=google.com; s=arc-20160816; b=cvYkhjcVGoEXG7nsdTulZ7iWvMb/ffWVS77pjBtbX4a3EoF/LcE54QPDb9d9ZuW0Vc YJBAzD04FlU1DQdlEK45/B0ut1/Oj3JWsYjGD7fwr3eZZwrwWRFDpqSw+F4XDvpaJqwd WSw4Rje5TtpVBsF0g/HUunmUO3OzvlYlRY8jbcxZsHwDGC8y29FXdNgtQ35hEYZ3KrRy MP/FQT0zoR8xRroqkq8axSqmMNirKoktMRQWaSU9yF8R9iipG9xhQywo+NlddGCUVo/j ld5+ngaJEEt3r5QC1Lgj/kCpo7cjLRzT6XiiP0BrzgoECY5T567gSZ1PToQ38lQsVTao mZnA== 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=6b3mOb1Dz0aFsXxXq6QqUe69oVRoyHa0qYGQlu21d9k=; b=kF0pMmhlWW4Le9gnTGniDt5Y/0Ch5WcL84Owt4fceo/KlseWAz32KUMePCEs3tBvp/ tlP7+KW9uCOB9Eu7iJdlIWHcwBqDE15eHhCp2eYJnPxx/x0RJBJb+zRIwk7Re+xCb9SI g256erYcahMUVMXv+u8kCltb4d/Z2zP2T6MJJhhwRumki/BZv1ZgrP3euqdkcuHgdMUs 2X7efdSsXfU44Ui+QQbb9ImFruNWZ3YQNKI97gWDtNJubMwU0fZiS21dsB1BZ4jl3doG 6nPt2yJXehvWfXKCDLP2oX2yu0lRPEAW5VaqFy9wGIn1Ykes6Y4AJDy/nsm0W7UbPhEn ODzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=u0ckSjnV; 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 b15si1546830ejd.66.2019.10.17.07.20.56; Thu, 17 Oct 2019 07:21:19 -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=u0ckSjnV; 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 S2395140AbfJPVzA (ORCPT + 99 others); Wed, 16 Oct 2019 17:55:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:45036 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395087AbfJPVyx (ORCPT ); Wed, 16 Oct 2019 17:54:53 -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 8D8EE20872; Wed, 16 Oct 2019 21:54:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262892; bh=vsdgNqKiAWkFY+P2z+lkOSG8ENvBsRipuXmCpmjROsA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u0ckSjnV9w/BsfS+dMgxw6lH+WO48Mm3Q2N13Qme0QoxLq1gpl0wmZHdz/UUvfGgy dK8C1FGIZkiHlWrkXMj7ayAleRVCxzKfo3AXVGJGBYYYIQKTMTpZ2Cq37u0wq0eomB jLIYJ2Cknjet+Z/KpCsbo5mBjutDnrSEVNqOm1Gw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold Subject: [PATCH 4.9 49/92] USB: adutux: fix NULL-derefs on disconnect Date: Wed, 16 Oct 2019 14:50:22 -0700 Message-Id: <20191016214835.619726516@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 b2fa7baee744fde746c17bc1860b9c6f5c2eebb7 upstream. The driver was 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 statements in the completion handlers which relies on said pointer. The pointer was also dereferenced unconditionally in a dev_dbg statement release() something which would lead to a NULL-deref whenever a device was disconnected before the final character-device close if debugging was enabled. 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: 1ef37c6047fe ("USB: adutux: remove custom debug macro and module parameter") Fixes: 66d4bc30d128 ("USB: adutux: remove custom debug macro") Cc: stable # 3.12 Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20190925092913.8608-2-johan@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/misc/adutux.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) --- a/drivers/usb/misc/adutux.c +++ b/drivers/usb/misc/adutux.c @@ -80,6 +80,7 @@ struct adu_device { char serial_number[8]; int open_count; /* number of times this port has been opened */ + unsigned long disconnected:1; char *read_buffer_primary; int read_buffer_length; @@ -121,7 +122,7 @@ static void adu_abort_transfers(struct a { unsigned long flags; - if (dev->udev == NULL) + if (dev->disconnected) return; /* shutdown transfer */ @@ -244,7 +245,7 @@ static int adu_open(struct inode *inode, } dev = usb_get_intfdata(interface); - if (!dev || !dev->udev) { + if (!dev) { retval = -ENODEV; goto exit_no_device; } @@ -327,7 +328,7 @@ static int adu_release(struct inode *ino } adu_release_internal(dev); - if (dev->udev == NULL) { + if (dev->disconnected) { /* the device was unplugged before the file was released */ if (!dev->open_count) /* ... and we're the last user */ adu_delete(dev); @@ -356,7 +357,7 @@ static ssize_t adu_read(struct file *fil return -ERESTARTSYS; /* 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 exit; @@ -525,7 +526,7 @@ static ssize_t adu_write(struct file *fi goto exit_nolock; /* 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 exit; @@ -794,11 +795,14 @@ static void adu_disconnect(struct usb_in usb_deregister_dev(interface, &adu_class); + usb_poison_urb(dev->interrupt_in_urb); + usb_poison_urb(dev->interrupt_out_urb); + mutex_lock(&adutux_mutex); usb_set_intfdata(interface, NULL); mutex_lock(&dev->mtx); /* not interruptible */ - dev->udev = NULL; /* poison */ + dev->disconnected = 1; mutex_unlock(&dev->mtx); /* if the device is not opened, then we clean up right now */