Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1372885ybp; Thu, 17 Oct 2019 11:48:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqybC5WUikGLXkQ7XrB4/bBgOsZvLLFI5RjctnP5uCv+o+CPuxUM6xmSbtZYmhWGr0fLgTPp X-Received: by 2002:a17:907:10d3:: with SMTP id rv19mr4736941ejb.301.1571338136908; Thu, 17 Oct 2019 11:48:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571338136; cv=none; d=google.com; s=arc-20160816; b=aJRY9yM0VMfN7L/BvuBQsLGYsZiEUGSIAr/AUeTTQ/4rKVqjO38x7a3D1AGPDK/Cv/ joEQbmwccA7lJ8VfsBOKLw2EnQ7Qmx6EEbkooe5KNFyzSWqT5wV8jGPtbrPKEKaE/2JG mxRsixAImFbyfIfqHnf/DeOkWeOys52kq355xUdeUulvhnMPurhyOQj815WsdY8WcZ10 97FJhn0n/fTRgdxtEb25sWgbu1/wor5WpYL/BTCeHjJhu/FS6fsTN8BhFJqap4GrEJpW dtgFFGfBLct8OHOU0S7+0Kg7aOCW8SXiaavUKk9x3cenFizGQ6oIlqkYTfWqQEmb87wZ OIkQ== 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=rPRXIFrBUwnD2/kIHTjmTURlFI8xZ99+f6QNFFhbE7A=; b=Lb8yj45l39KgH3W85bpj+7ZQHYPWko7gbSBujjhBdPrUd+NQF12Yu96VMO5H9m4ppB YBb7Jqng0SS4+bE+q8mvtHWgAkWd7KHE5uaYqIgXlWG68Lym+H2ymUOi+qscqOuPj4cC NqR/QxYdCLhMgO7KbAPrbXKEVX+KdXyDhV/r4Ri+EDYQs5xg1Y2nC5DmohCP+pm4qGd2 q/ZEzkgVosUFjJ15USJTHwV6/Md7WElONrAsikO7NFdAD0l2fWsb9Ya50uKxGzeVCNMv WE1XTU8IFzD1IetzVPYKfhGjkn5tUEYBaKznX5/SGtthmFLQoNLR3+QeJCiuXEPQC9Ol SeEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MBMC0dNU; 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 d17si1953885edv.76.2019.10.17.11.48.34; Thu, 17 Oct 2019 11:48:56 -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=MBMC0dNU; 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 S2439198AbfJPWLE (ORCPT + 99 others); Wed, 16 Oct 2019 18:11:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:49388 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395445AbfJPV5F (ORCPT ); Wed, 16 Oct 2019 17:57:05 -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 35B4921928; Wed, 16 Oct 2019 21:57:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571263024; bh=LY9IoeQ4KDR5F+hVavxrD1Vb2SUzTkDoVSL59UYUWi4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MBMC0dNUTCYoUMfbbWCAmITBcx05HU3DibtoJ1pQ3Se1ymXbtwJ3Jyt+JPWNBukjX DNYntigERwqRzMwCmfzawopBuessG3FrSK7k1J6lbvid+vc1wrM/H5upGR0tYWvclD zr4YeM0V/gbuV+mby/8viepfNQbVIDEHG0bV9f/U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold Subject: [PATCH 4.19 25/81] USB: serial: keyspan: fix NULL-derefs on open() and write() Date: Wed, 16 Oct 2019 14:50:36 -0700 Message-Id: <20191016214827.671778494@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 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 @@ -1741,8 +1741,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";