Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1041204ybp; Thu, 17 Oct 2019 07:14:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqzVC9ErkmscU1RIaMkpFIlEcY/h+T8Eu7fzvrgUy+KqJUjvEvu71b6OEgOWEIk5H3RONETp X-Received: by 2002:a17:906:5502:: with SMTP id r2mr3789857ejp.3.1571321676523; Thu, 17 Oct 2019 07:14:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571321676; cv=none; d=google.com; s=arc-20160816; b=saSv13vTowzNMMUxF7Qk1HVwbg0QNszz/bqF1f1dt4vecrt4dP3TW3FRSXUoHoL+yP 1bKnzn3TB2ezQCD6bL3UgunKibP6Xt69AgJZLNIb2FaGjDMBDT5biurgV9N20in5U1ui 24xc5XUwb+nIkS2WGJzgjijETBcqIdjnrdjg7VLEaWfHqsomZm7E9Cy4L9r7KOliC1qm QPZhl/NcVPCOTcCyU+eF1+qd8AUmZVSl0A/PP2lalR3AODrpNh1S/dsXUcSXCcxY+jE8 XHrac4a1eT7KVyxdUlFoz7LQg9fo+Wp5MuunwBfhL1cV41ET5q7N235EBJdk/5cDIh2v qDmw== 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=dG0csvcWq7Y0s6NzIVrQ3mTekrXpSm39m7UWgbKcVSM=; b=R2jprHesj2hfXkNgmpr1aySMa9QtVJ4KkyaPll08yan3Z8hqsW8kgHvp/N0zEjPCN/ rwM7o1imZObx7t/ZRi8PNRe1g9xdla/kFPwZZej52dnQfucLAzXD9UzykUJzDHxCPW0W UgvDqVjkKXylz3lyYi+Igm2QCqMxa6gBGUIcWsiDTNQ8VHZ8KiJb2ETdCr9tJbL13d+m vwPXDHDExf8vSUYSlChbz2p6hsFrT5FI/0p2pa5RabmQE4X1/pGO0ibGYFsFGqYV58+/ wGwK/rjwiKA5VkzvnozM91e+hP1awhXc6DtBsTLoGe0Ve3VTbAjxVQ+WRmkZFp4EIdSc TOBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XT4H6hbT; 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 g30si1666535eda.2.2019.10.17.07.14.13; Thu, 17 Oct 2019 07:14:36 -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=XT4H6hbT; 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 S1732301AbfJPVxj (ORCPT + 99 others); Wed, 16 Oct 2019 17:53:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:42350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394866AbfJPVx2 (ORCPT ); Wed, 16 Oct 2019 17:53:28 -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 31123218DE; Wed, 16 Oct 2019 21:53:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262807; bh=WJxsk3iTHP/EXOLmCy0Peiyb2dGusCZDXFkH7uI2Tk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XT4H6hbTX+rWzul3t/nLiU3/MNnKDBWKmCkjZsh/FAgbJYQh4w1vvCMu0NEvQGVOL fXk29lI7JpHxyCZ+FKONyFBn1Ng7xZ4aH/hSFibqzpySK8Dk2PUDNKTvbfQwf71apH zQbOwerTrI8HbBbCgw2aKBhcWwHmNmSYRTS4g1qo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold Subject: [PATCH 4.4 49/79] USB: serial: keyspan: fix NULL-derefs on open() and write() Date: Wed, 16 Oct 2019 14:50:24 -0700 Message-Id: <20191016214812.286675565@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 7d7e21fafdbc7fcf0854b877bd0975b487ed2717 upstream. Fix NULL-pointer dereferences on open() and write() which can be triggered by a malicious USB device. The current URB allocation helper would fail to initialise the newly allocated URB if the device has unexpected endpoint descriptors, something which could lead NULL-pointer dereferences in a number of open() and write() paths when accessing the URB. For example: BUG: kernel NULL pointer dereference, address: 0000000000000000 ... RIP: 0010:usb_clear_halt+0x11/0xc0 ... Call Trace: ? tty_port_open+0x4d/0xd0 keyspan_open+0x70/0x160 [keyspan] serial_port_activate+0x5b/0x80 [usbserial] tty_port_open+0x7b/0xd0 ? check_tty_count+0x43/0xa0 tty_open+0xf1/0x490 BUG: kernel NULL pointer dereference, address: 0000000000000000 ... RIP: 0010:keyspan_write+0x14e/0x1f3 [keyspan] ... Call Trace: serial_write+0x43/0xa0 [usbserial] n_tty_write+0x1af/0x4f0 ? do_wait_intr_irq+0x80/0x80 ? process_echoes+0x60/0x60 tty_write+0x13f/0x2f0 BUG: kernel NULL pointer dereference, address: 0000000000000000 ... RIP: 0010:keyspan_usa26_send_setup+0x298/0x305 [keyspan] ... Call Trace: keyspan_open+0x10f/0x160 [keyspan] serial_port_activate+0x5b/0x80 [usbserial] tty_port_open+0x7b/0xd0 ? check_tty_count+0x43/0xa0 tty_open+0xf1/0x490 Fixes: fdcba53e2d58 ("fix for bugzilla #7544 (keyspan USB-to-serial converter)") Cc: stable # 2.6.21 Reviewed-by: Greg Kroah-Hartman Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/keyspan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c @@ -1249,8 +1249,8 @@ static struct urb *keyspan_setup_urb(str ep_desc = find_ep(serial, endpoint); if (!ep_desc) { - /* leak the urb, something's wrong and the callers don't care */ - return urb; + usb_free_urb(urb); + return NULL; } if (usb_endpoint_xfer_int(ep_desc)) { ep_type_name = "INT";