Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1366310ybp; Thu, 17 Oct 2019 11:42:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqz8qmUc/8v0dpj+LypCxdE81JZf+UFpCbXMaETHGlFLX8UQMBre3b0fBfbO9ARRXXeWo4Vb X-Received: by 2002:a50:af45:: with SMTP id g63mr5267674edd.21.1571337732790; Thu, 17 Oct 2019 11:42:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571337732; cv=none; d=google.com; s=arc-20160816; b=bIZSBp3c/bZqT7sTy/rFEDFR5O3PEhyn5pNmcXdNj1jvVDkL6nVcPI0VoE8cDRCCyl iTdCZhXnGCWSwBvhoNje3mA67WsOG+q3R1ezGfs1va8lL0OhNwQBt+AwCeYcRHVZrCvP 2rxMfzCezAYgSWWxWY6Tg0tXWv6hHKz732ao4v4IoSVMgpZyFrzMTRzWcityNj/cPSDD 43Dgvp+4kdgkITer9SA08aw0LlbOS8lGqUdEE1e74oPXzrulQtTpiWaUE7NVumQxj6jn wGPZksFwReTFrkDmPmFci9Px4YBMLp7jGZHCwm2IWuJ2c76hNC3zYZ6UT9Xeo7WRuow8 4U5w== 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=xf6EFAZm1JOkYCQPjxIMjGohN2GxCk6Ya9HUtcHV2yg=; b=WHp5ssdnmGHwFhrD1POVzf8cGSfcTUbLA/yD4hYWDFuFZOW+P44L4U7dRQu3svszB9 b7hxTucZPjj6W3qQwhpgFGgHdEWZfIeY7nlQbXjOf+trqY5PejIILkZc/Yw6tG9/hDkg 704qzuM4sDsHI9/w3NdMc0RYiDBW4cYDuvYDYkM5oR4A9RT9FaMLgTrA9XASJpiLcq0i XEFWYBrFMj+3tlH8JnxrDt8f7trkdB14/q2BP6hz1C33L5/2VKdlVYSmR97X8gHne35K JQSyvR4wdcO/mxaAWQpAvPOKTaN9jCzXqM+REzqkZ2feYYWeriE1uFPjR8ySfBskLsOI pd0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iykxtzwH; 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 e4si1985702edy.295.2019.10.17.11.41.49; Thu, 17 Oct 2019 11:42: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=iykxtzwH; 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 S2407183AbfJPWKT (ORCPT + 99 others); Wed, 16 Oct 2019 18:10:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:49824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437980AbfJPV5R (ORCPT ); Wed, 16 Oct 2019 17:57:17 -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 582C221928; Wed, 16 Oct 2019 21:57:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571263037; bh=ONS2EygcQU152NOuMAZMhNEtFoUo4KLiKujogzhpwkw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iykxtzwHiygYs+JhMzGfUGuEdyOrpzkFYx1DvBQwjIieq6DTdybzuqkuHUCdVdrXq RYolmeZrTPUn0iZQyR3a0uUlXK0rqCcCKIO4dLvHtQjU1vMQLsFkzTqDST34+V1bm3 1beastq+1l+ue0sal51hrPDZ+Mr1MSvyLBBGY2WQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold Subject: [PATCH 4.19 07/81] USB: usb-skeleton: fix NULL-deref on disconnect Date: Wed, 16 Oct 2019 14:50:18 -0700 Message-Id: <20191016214812.519618795@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214805.727399379@linuxfoundation.org> References: <20191016214805.727399379@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 bed5ef230943863b9abf5eae226a20fad9a8ff71 upstream. The driver was using its struct usb_interface pointer as an inverted disconnected flag and was setting it to NULL before making sure all completion handlers had run. This could lead to NULL-pointer dereferences in the dev_err() statements in the completion handlers which relies on said pointer. Fix this by using a dedicated disconnected flag. Note that this is also addresses a NULL-pointer dereference at release() and a struct usb_interface reference leak introduced by a recent runtime PM fix, which depends on and should have been submitted together with this patch. Fixes: 4212cd74ca6f ("USB: usb-skeleton.c: remove err() usage") Fixes: 5c290a5e42c3 ("USB: usb-skeleton: fix runtime PM after driver unbind") Cc: stable Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20191009170944.30057-2-johan@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/usb-skeleton.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/drivers/usb/usb-skeleton.c +++ b/drivers/usb/usb-skeleton.c @@ -59,6 +59,7 @@ struct usb_skel { spinlock_t err_lock; /* lock for errors */ struct kref kref; struct mutex io_mutex; /* synchronize I/O with disconnect */ + unsigned long disconnected:1; wait_queue_head_t bulk_in_wait; /* to wait for an ongoing read */ }; #define to_skel_dev(d) container_of(d, struct usb_skel, kref) @@ -236,7 +237,7 @@ static ssize_t skel_read(struct file *fi if (rv < 0) return rv; - if (!dev->interface) { /* disconnect() was called */ + if (dev->disconnected) { /* disconnect() was called */ rv = -ENODEV; goto exit; } @@ -418,7 +419,7 @@ static ssize_t skel_write(struct file *f /* this lock makes sure we don't submit URBs to gone devices */ mutex_lock(&dev->io_mutex); - if (!dev->interface) { /* disconnect() was called */ + if (dev->disconnected) { /* disconnect() was called */ mutex_unlock(&dev->io_mutex); retval = -ENODEV; goto error; @@ -569,7 +570,7 @@ static void skel_disconnect(struct usb_i /* prevent more I/O from starting */ mutex_lock(&dev->io_mutex); - dev->interface = NULL; + dev->disconnected = 1; mutex_unlock(&dev->io_mutex); usb_kill_anchored_urbs(&dev->submitted);