Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp234480ybg; Thu, 17 Oct 2019 22:05:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqxppnkVG7+SdnMy8OqrL65KqWb++Eno+cR4XhCFJjZ4l53Sg7M70qg1ns4iyt0i1iJ6G8jI X-Received: by 2002:a17:906:95cc:: with SMTP id n12mr5156185ejy.111.1571375144583; Thu, 17 Oct 2019 22:05:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571375144; cv=none; d=google.com; s=arc-20160816; b=dxuzkeYxNRxAdXlBV7vsfgV7b+2nxq7eIELBILw6O4b1PNu/E/1gq4VQtYjmIN4lZ9 JzysUI3TozrKTW0PXQqbG1wI00Qb9UQbOfnZktmUW4fOsJqMpjD9WU1EB+7sI7N3ut0L HygwmNWTVmQPhecxYct0jXx8Ox4Tq+mrtRMTPfNYgWdYnTehr/EDbeGsYWjrQQ/Vpf6o 9VQYnrI0cqMHc63GB3S3tXZzn9xENb0b9rX4VMuFhaidkAK7z7d9A6U/1pWl42NNd05S 8gV1rKfBqUICGRdx62MPLj+wOhUz/m7proEjTGE265KoFk8HCaTKKw6hfBz6eLf/KedM SkMA== 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=00wVhMZb2umqiajsQLG3RYreN34nnskvy18GbxGL06I=; b=P5omWwbDFx3aLtvkTWOyCPYMe128PulStcg+8zhhVKR/Ia/NBz2ewWye6hnV5B3sda +cUxfI4BQtwrQ0n6H/iDQsvPkzLN1SVbuwBl+WfCNaeB5PX2dktCl8ZwHgLyZ1/F3WEU 86aIS3dD5QUwjH+HXbENDIWg91XLT9cGMFnpjcTWd3yCtkVvoKT2VQ+i98DDfhpMcm/I hnGd0cBOrsInw643ZAMcw98dBzCbjznVWs8DgiBwPPLB3RxUjpYUIqoPE546FG2uRYQD KolcngVTggCJzXAaTIcCtzqWPbq1SBHWFnhnZTK3KtA5NWEDRVcGWhOMkz+VBb0b8gjs wnpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mwtFIqxN; 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 x29si2951918eda.297.2019.10.17.22.05.21; Thu, 17 Oct 2019 22:05:44 -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=mwtFIqxN; 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 S2394115AbfJPWTw (ORCPT + 99 others); Wed, 16 Oct 2019 18:19:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:43452 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437625AbfJPVx7 (ORCPT ); Wed, 16 Oct 2019 17:53:59 -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 043F8222BD; Wed, 16 Oct 2019 21:53:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262839; bh=ChfEVbx/mpk2KVxURUhdYDOF/BWXuLYcX9yTbqacXOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mwtFIqxNYstUxQXGhdZjfyinj36JpdNjaVRC6ZvlFNUXQ6zWyUnmYkxkvclQ55wzn JSr0Li3jKWC0dpH78yHCUhC+YywAh+VTXarEouMjQrDTwQ0BSbqLMX6p13TjxABCAn YCGIpAvP6NSTJghA4fuR/35J0SQhsvJ+l+MknOiE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold Subject: [PATCH 4.4 44/79] USB: iowarrior: fix use-after-free after driver unbind Date: Wed, 16 Oct 2019 14:50:19 -0700 Message-Id: <20191016214806.597352224@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214729.758892904@linuxfoundation.org> References: <20191016214729.758892904@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 b5f8d46867ca233d773408ffbe691a8062ed718f upstream. Make sure to stop also the asynchronous write URBs on disconnect() to avoid use-after-free in the completion handler after driver unbind. Fixes: 946b960d13c1 ("USB: add driver for iowarrior devices.") Cc: stable # 2.6.21: 51a2f077c44e ("USB: introduce usb_anchor") Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20191009104846.5925-4-johan@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/misc/iowarrior.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c @@ -89,6 +89,7 @@ struct iowarrior { char chip_serial[9]; /* the serial number string of the chip connected */ int report_size; /* number of bytes in a report */ u16 product_id; + struct usb_anchor submitted; }; /*--------------*/ @@ -437,11 +438,13 @@ static ssize_t iowarrior_write(struct fi retval = -EFAULT; goto error; } + usb_anchor_urb(int_out_urb, &dev->submitted); retval = usb_submit_urb(int_out_urb, GFP_KERNEL); if (retval) { dev_dbg(&dev->interface->dev, "submit error %d for urb nr.%d\n", retval, atomic_read(&dev->write_busy)); + usb_unanchor_urb(int_out_urb); goto error; } /* submit was ok */ @@ -788,6 +791,8 @@ static int iowarrior_probe(struct usb_in iface_desc = interface->cur_altsetting; dev->product_id = le16_to_cpu(udev->descriptor.idProduct); + init_usb_anchor(&dev->submitted); + /* set up the endpoint information */ for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; @@ -917,6 +922,7 @@ static void iowarrior_disconnect(struct Deleting the device is postponed until close() was called. */ usb_kill_urb(dev->int_in_urb); + usb_kill_anchored_urbs(&dev->submitted); wake_up_interruptible(&dev->read_wait); wake_up_interruptible(&dev->write_wait); mutex_unlock(&dev->mutex);