From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [2/4] USB: serial: mos7840: fix status-register error handling From: Johan Hovold Message-Id: <20180704150219.27389-2-johan@kernel.org> Date: Wed, 4 Jul 2018 17:02:17 +0200 To: Johan Hovold Cc: Greg Kroah-Hartman , linux-usb@vger.kernel.org, stable , Paul B Schroeder List-ID: QWRkIG1pc3NpbmcgdHJhbnNmZXItbGVuZ3RoIHNhbml0eSBjaGVjayB0byB0aGUgc3RhdHVzLXJl Z2lzdGVyCmNvbXBsZXRpb24gaGFuZGxlciB0byBhdm9pZCBsZWFraW5nIGJpdHMgb2YgdW5pbml0 aWFsaXNlZCBzbGFiIGRhdGEgdG8KdXNlciBzcGFjZS4KCkZpeGVzOiAzZjU0Mjk3NDZkOTEgKCJV U0I6IE1vc2NoaXAgNzg0MCBVU0ItU2VyaWFsIERyaXZlciIpCkNjOiBzdGFibGUgPHN0YWJsZUB2 Z2VyLmtlcm5lbC5vcmc+ICAgICAjIDIuNi4xOQpDYzogUGF1bCBCIFNjaHJvZWRlciA8cHNjaHJv ZWRlckB1cGxvZ2l4LmNvbT4KU2lnbmVkLW9mZi1ieTogSm9oYW4gSG92b2xkIDxqb2hhbkBrZXJu ZWwub3JnPgotLS0KIGRyaXZlcnMvdXNiL3NlcmlhbC9tb3M3ODQwLmMgfCAzICsrKwogMSBmaWxl IGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL3Nlcmlh bC9tb3M3ODQwLmMgYi9kcml2ZXJzL3VzYi9zZXJpYWwvbW9zNzg0MC5jCmluZGV4IGZkY2ViNDZk OWZjNi4uYjU4MGI0YzdmYTQ4IDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9zZXJpYWwvbW9zNzg0 MC5jCisrKyBiL2RyaXZlcnMvdXNiL3NlcmlhbC9tb3M3ODQwLmMKQEAgLTQ2OCw2ICs0NjgsOSBA QCBzdGF0aWMgdm9pZCBtb3M3ODQwX2NvbnRyb2xfY2FsbGJhY2soc3RydWN0IHVyYiAqdXJiKQog CX0KIAogCWRldl9kYmcoZGV2LCAiJXMgdXJiIGJ1ZmZlciBzaXplIGlzICVkXG4iLCBfX2Z1bmNf XywgdXJiLT5hY3R1YWxfbGVuZ3RoKTsKKwlpZiAodXJiLT5hY3R1YWxfbGVuZ3RoIDwgMSkKKwkJ Z290byBvdXQ7CisKIAlkZXZfZGJnKGRldiwgIiVzIG1vczc4NDBfcG9ydC0+TXNyTHNyIGlzICVk IHBvcnQgJWRcbiIsIF9fZnVuY19fLAogCQltb3M3ODQwX3BvcnQtPk1zckxzciwgbW9zNzg0MF9w b3J0LT5wb3J0X251bSk7CiAJZGF0YSA9IHVyYi0+dHJhbnNmZXJfYnVmZmVyOwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f67.google.com ([209.85.215.67]:45553 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752242AbeGDPCu (ORCPT ); Wed, 4 Jul 2018 11:02:50 -0400 From: Johan Hovold To: Johan Hovold Cc: Greg Kroah-Hartman , linux-usb@vger.kernel.org, stable , Paul B Schroeder Subject: [PATCH 2/4] USB: serial: mos7840: fix status-register error handling Date: Wed, 4 Jul 2018 17:02:17 +0200 Message-Id: <20180704150219.27389-2-johan@kernel.org> In-Reply-To: <20180704150219.27389-1-johan@kernel.org> References: <20180704150219.27389-1-johan@kernel.org> Sender: stable-owner@vger.kernel.org List-ID: Add missing transfer-length sanity check to the status-register completion handler to avoid leaking bits of uninitialised slab data to user space. Fixes: 3f5429746d91 ("USB: Moschip 7840 USB-Serial Driver") Cc: stable # 2.6.19 Cc: Paul B Schroeder Signed-off-by: Johan Hovold --- drivers/usb/serial/mos7840.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index fdceb46d9fc6..b580b4c7fa48 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c @@ -468,6 +468,9 @@ static void mos7840_control_callback(struct urb *urb) } dev_dbg(dev, "%s urb buffer size is %d\n", __func__, urb->actual_length); + if (urb->actual_length < 1) + goto out; + dev_dbg(dev, "%s mos7840_port->MsrLsr is %d port %d\n", __func__, mos7840_port->MsrLsr, mos7840_port->port_num); data = urb->transfer_buffer; -- 2.18.0