From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZosGXzfIMw3KcYSRxKP5J+9PMVJF824e2/Y+17tBcOCAwAVpj1IuBghggfZzS0rwgB7z9VW ARC-Seal: i=1; a=rsa-sha256; t=1525767380; cv=none; d=google.com; s=arc-20160816; b=QcJCNTmxEapMIgpIXV60bBLXdhM/s4Nt7YkbFATYIDHPh6PjIoGSVHit1oTGzc60ed Nl/EtnH/kkj+6L8wTIX8VFsY9mwpa2ouUia0q5uMxl2g+Gx0mBQpjaE3ACs3sbkcaRvj vDVFWeMEyDBSDjGP/t73tblmAOjXmKDWQCbHdkfJ9BChD/oINIdnNrIN3SITtrGFBQQO cgsbNuXiW8gvQnGLP12gywN+x/QM4yOdg37oWuPufdRU9Mtcj+tad03kbLqiGX187+fc VNiMHfAewJKOcfqEgW66kSG5u/zTxfzDG7N5s+SuDH6eYISGMw+Dna87AVosFueqILBu DHtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=eXLlw5aZDfw+yYh/USXIyOsfgNRj3M7tuRK5rK65wh4=; b=dr4C0Ms/A/jRkhDV67Igaqf7otaXCELy/8q7zqnoRi8O+XJdqTsgiopkozxp1fmHAF 0ydTkSRUHQ+mp8S/Ep7olhpJXqg7ZqkWtYmrBOShGAfQwJI2Jeh14TyOfb6Oy3xRflWk 3yEq3ZzNjfeii0JTe2Hv67RORh4k/RqEtMLYM3xUSmaPhDZCAoh4KBuWOZwztQJ4xVqP C6Slpe2KPjSpzTLzX2Z4Xo/KqhCqrrtdh3/3g0Llvvob5sschtmQyGGc81sxTTgVs3EZ 0I9J6oTRCDdxe/QJLN596XIH85SbL9smMNM9Gtt/yZubjRCfxRDAyM0KQukbzaYp/Sv6 0eWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=W0wmFtyT; spf=pass (google.com: domain of srs0=4in3=h3=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=4In3=H3=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=W0wmFtyT; spf=pass (google.com: domain of srs0=4in3=h3=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=4In3=H3=linuxfoundation.org=gregkh@kernel.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrey Konovalov , Johan Hovold Subject: [PATCH 4.14 34/43] USB: serial: visor: handle potential invalid device configuration Date: Tue, 8 May 2018 10:10:53 +0200 Message-Id: <20180508074009.257659065@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180508074003.984433784@linuxfoundation.org> References: <20180508074003.984433784@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1599882894176244438?= X-GMAIL-MSGID: =?utf-8?q?1599883056848028220?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman commit 4842ed5bfcb9daf6660537d70503c18d38dbdbb8 upstream. If we get an invalid device configuration from a palm 3 type device, we might incorrectly parse things, and we have the potential to crash in "interesting" ways. Fix this up by verifying the size of the configuration passed to us by the device, and only if it is correct, will we handle it. Note that this also fixes an information leak of slab data. Reported-by: Andrey Konovalov Reviewed-by: Andrey Konovalov Signed-off-by: Greg Kroah-Hartman [ johan: add comment about the info leak ] Cc: stable Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/visor.c | 69 ++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 34 deletions(-) --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c @@ -338,47 +338,48 @@ static int palm_os_3_probe(struct usb_se goto exit; } - if (retval == sizeof(*connection_info)) { - connection_info = (struct visor_connection_info *) - transfer_buffer; - - num_ports = le16_to_cpu(connection_info->num_ports); - for (i = 0; i < num_ports; ++i) { - switch ( - connection_info->connections[i].port_function_id) { - case VISOR_FUNCTION_GENERIC: - string = "Generic"; - break; - case VISOR_FUNCTION_DEBUGGER: - string = "Debugger"; - break; - case VISOR_FUNCTION_HOTSYNC: - string = "HotSync"; - break; - case VISOR_FUNCTION_CONSOLE: - string = "Console"; - break; - case VISOR_FUNCTION_REMOTE_FILE_SYS: - string = "Remote File System"; - break; - default: - string = "unknown"; - break; - } - dev_info(dev, "%s: port %d, is for %s use\n", - serial->type->description, - connection_info->connections[i].port, string); - } + if (retval != sizeof(*connection_info)) { + dev_err(dev, "Invalid connection information received from device\n"); + retval = -ENODEV; + goto exit; } - /* - * Handle devices that report invalid stuff here. - */ + + connection_info = (struct visor_connection_info *)transfer_buffer; + + num_ports = le16_to_cpu(connection_info->num_ports); + + /* Handle devices that report invalid stuff here. */ if (num_ports == 0 || num_ports > 2) { dev_warn(dev, "%s: No valid connect info available\n", serial->type->description); num_ports = 2; } + for (i = 0; i < num_ports; ++i) { + switch (connection_info->connections[i].port_function_id) { + case VISOR_FUNCTION_GENERIC: + string = "Generic"; + break; + case VISOR_FUNCTION_DEBUGGER: + string = "Debugger"; + break; + case VISOR_FUNCTION_HOTSYNC: + string = "HotSync"; + break; + case VISOR_FUNCTION_CONSOLE: + string = "Console"; + break; + case VISOR_FUNCTION_REMOTE_FILE_SYS: + string = "Remote File System"; + break; + default: + string = "unknown"; + break; + } + dev_info(dev, "%s: port %d, is for %s use\n", + serial->type->description, + connection_info->connections[i].port, string); + } dev_info(dev, "%s: Number of ports: %d\n", serial->type->description, num_ports);