Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1051994ybp; Thu, 17 Oct 2019 07:22:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqzLbijuvTsPyUu6kb0doIaQbs7ETOqm7uea9GZuc9syz4hKplI85ZGRvQFKXjj7vugavZr3 X-Received: by 2002:a17:906:3615:: with SMTP id q21mr3663016ejb.152.1571322179871; Thu, 17 Oct 2019 07:22:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571322179; cv=none; d=google.com; s=arc-20160816; b=EaQw779k/ziAZTzS6QCm8l/bnZEBXh/SxjxHiVAOXrQt4K7ypnjro4FFBCdX55JOr/ 5JRKSSPIG24EDZB/u4Mn0ZdWfdg2BzK0iFFugHMzrVImchVgy9tFfaYJLEihUF+ir3rq qSPQYJFsCRZpMf1MxPzxqSgUF7moASK0jkQvcxgx7sJI/Y89KwJ1v+IjcKc+b51AmOrd QX9zhGny1kDitKuubFTQzm790lTYDnFTkRhFrh0RXI0u5acRNrBfbUXQ+e8O2To/Nq+0 AiR6js2OHSniBtNeREelQjrU6eFxCvmWMSKGp3bWZu05o8F8NSsfzs9KlIxXjYJiyRwW +xJg== 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=Qsib8o3sg5Wdlm7SkvmWIEWhlO6Iitoy3PXbzBiqgWI=; b=RRy1+3a1xoIDqHFT7+fbn72Gujnacyhgf17jYQg7HV4bkCX7nGRKB+hZOGAgEEKIm5 rfuRtG+zbF4ZYHwByMCcu9wjf59W287BZwjbMNwgaPqPfJeadFExPkXoSqG1UKoV655q x4G6Lz1wmSKGyFFD+4kqeApV/8eM1arFE6eb5sV9eCVZltwY66SDJ7o4GgxkKrOa+NZh AXABhxvN/j4fxtXPwTJxZpoTaNmd/zQMW91f7mTG6BkUsYcukdUjLHZeVGadLv9thSl4 gBCCF/kLaxhycBFd/wmhVD8akN7sgLj3xvstClE2Q63phUEwfrgg8wfrY7jJC8JK3lws E6Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="dNvDpF3/"; 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 qx24si1530518ejb.138.2019.10.17.07.22.37; Thu, 17 Oct 2019 07:22:59 -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="dNvDpF3/"; 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 S2437811AbfJPVzY (ORCPT + 99 others); Wed, 16 Oct 2019 17:55:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:45932 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437772AbfJPVzU (ORCPT ); Wed, 16 Oct 2019 17:55:20 -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 0010121D7D; Wed, 16 Oct 2019 21:55:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262920; bh=91dLTxL1+yZrbkADc3p44ZP+AXwaxgJkAIS8hUcNT8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dNvDpF3/I82xcVe/we1KLBCXLLUgwf8FCMDpAL2jUtPvwPSwrtYnh0iltBrrh31lZ KztgoaM8xrvk6laTx9PxSoHUNbj3YgVZ6lGlYWgZEGWDMGFIW25gXUauH/Dzle6fl1 GoS987ZfCcf7YL65wa0c9gK9MvKcDBKONUTHr17E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold Subject: [PATCH 4.9 53/92] USB: iowarrior: fix use-after-free after driver unbind Date: Wed, 16 Oct 2019 14:50:26 -0700 Message-Id: <20191016214837.632917418@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 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; }; /*--------------*/ @@ -435,11 +436,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 */ @@ -782,6 +785,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; @@ -905,6 +910,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);