Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3401398pxk; Mon, 5 Oct 2020 08:46:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzw+20A1/onMR7FPSFx/jpcwoxlCZrbIhFTiQYdZtdUGQvRdkU3VT+w8hLWwiySvSdfhoH7 X-Received: by 2002:a50:fa88:: with SMTP id w8mr233932edr.179.1601912797344; Mon, 05 Oct 2020 08:46:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601912797; cv=none; d=google.com; s=arc-20160816; b=nAh1fIIkrYnivjSQQx1ACOw3q7rcIIdC9N0+q+TxQm7rEwnDeaj27aiWyhcWrZwFdb qPJPmbNcA//beKPv+H4rNs0XnXsx8eVAMBJdM8btylBF7iQnGwkbD+41mveIpobaJMox ziVYRj+3NK+nMPOPxWqwgumuctjj2AoGxcjqkvcYr7LQeVGB43SvaQNw3J9c39uYM/AV 8OVCuKj602f4XlJ/vpYkmoN6xAaeWGDhEh80EycYGIzb+2AO7jewJsErGYpcEjOhiDhT qCECHe11KIqwIWzO8/costnMVGkUFozXH8jdsHi6M3y3m6j4W9HsnnjKBHXBEu5Q13tV nEtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rfePczZS2WKEntKYAONxOUQwnl8nNtWdJQkndvryzFc=; b=tXV8Fbn01RWTO7PnTeXYVOgXj7qXuOEdEq5vwlcmbuBGjjMpQ22hELisbEDgkFr2EQ 9TZNJsn2nVlARS0+W0XcpOpwM4j1iJm+Tsm1h50gLjEe6FEHe4Gs9EGBfpahJBjl44eR QqX97TYN1bx5yLkjDjIaDD0l9TxUV83A3KYFGV1oRXno9ONmlWOrasha19Qz1u7+5WC4 RjOmcfziaI7BHgq1RfNDHfqLs+5zVFHi+8uybR5s2MKFx/302c7D5vB0IwovOVbPaBy4 MAYLlU1y0erOzqt0Gr6HoH/id472xRD+Hy6Ocrr+ZuQzsR0VnYUJfTEqoRIwJr+TGJ/b C1Ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rhk2IQKu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id rl11si8290285ejb.701.2020.10.05.08.46.12; Mon, 05 Oct 2020 08:46:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rhk2IQKu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728872AbgJEPlz (ORCPT + 99 others); Mon, 5 Oct 2020 11:41:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:53638 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727397AbgJEP2h (ORCPT ); Mon, 5 Oct 2020 11:28:37 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 43CE82074F; Mon, 5 Oct 2020 15:28:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601911716; bh=Xr0BYkgvG5YLQWByAuoJf2UjFD+QCNkcpJEYO9N8oqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rhk2IQKuNQJ11N3FVHZLlva08BTCo8bZNVr32Qd6ijF6zcHSWwiYiW+6N3XOX3Kn7 IOqm5jRs48oYfnMDQG8cLZjcD0ahJih1faEtIzFg1U1CU57XAnnhrBCDeof7pux3ya GpIgMCh2QB/PB5Q7wNsK+Q9Gj+kYImBSC5DaoLLk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilja Van Sprundel , Brooke Basile , stable , Bryan ODonoghue Subject: [PATCH 5.4 03/57] USB: gadget: f_ncm: Fix NDP16 datagram validation Date: Mon, 5 Oct 2020 17:26:15 +0200 Message-Id: <20201005142109.966570222@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005142109.796046410@linuxfoundation.org> References: <20201005142109.796046410@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bryan O'Donoghue commit 2b405533c2560d7878199c57d95a39151351df72 upstream. commit 2b74b0a04d3e ("USB: gadget: f_ncm: add bounds checks to ncm_unwrap_ntb()") adds important bounds checking however it unfortunately also introduces a bug with respect to section 3.3.1 of the NCM specification. wDatagramIndex[1] : "Byte index, in little endian, of the second datagram described by this NDP16. If zero, then this marks the end of the sequence of datagrams in this NDP16." wDatagramLength[1]: "Byte length, in little endian, of the second datagram described by this NDP16. If zero, then this marks the end of the sequence of datagrams in this NDP16." wDatagramIndex[1] and wDatagramLength[1] respectively then may be zero but that does not mean we should throw away the data referenced by wDatagramIndex[0] and wDatagramLength[0] as is currently the case. Breaking the loop on (index2 == 0 || dg_len2 == 0) should come at the end as was previously the case and checks for index2 and dg_len2 should be removed since zero is valid. I'm not sure how much testing the above patch received but for me right now after enumeration ping doesn't work. Reverting the commit restores ping, scp, etc. The extra validation associated with wDatagramIndex[0] and wDatagramLength[0] appears to be valid so, this change removes the incorrect restriction on wDatagramIndex[1] and wDatagramLength[1] restoring data processing between host and device. Fixes: 2b74b0a04d3e ("USB: gadget: f_ncm: add bounds checks to ncm_unwrap_ntb()") Cc: Ilja Van Sprundel Cc: Brooke Basile Cc: stable Signed-off-by: Bryan O'Donoghue Link: https://lore.kernel.org/r/20200920170158.1217068-1-bryan.odonoghue@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/function/f_ncm.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) --- a/drivers/usb/gadget/function/f_ncm.c +++ b/drivers/usb/gadget/function/f_ncm.c @@ -1189,7 +1189,6 @@ static int ncm_unwrap_ntb(struct gether const struct ndp_parser_opts *opts = ncm->parser_opts; unsigned crc_len = ncm->is_crc ? sizeof(uint32_t) : 0; int dgram_counter; - bool ndp_after_header; /* dwSignature */ if (get_unaligned_le32(tmp) != opts->nth_sign) { @@ -1216,7 +1215,6 @@ static int ncm_unwrap_ntb(struct gether } ndp_index = get_ncm(&tmp, opts->ndp_index); - ndp_after_header = false; /* Run through all the NDP's in the NTB */ do { @@ -1232,8 +1230,6 @@ static int ncm_unwrap_ntb(struct gether ndp_index); goto err; } - if (ndp_index == opts->nth_size) - ndp_after_header = true; /* * walk through NDP @@ -1312,37 +1308,13 @@ static int ncm_unwrap_ntb(struct gether index2 = get_ncm(&tmp, opts->dgram_item_len); dg_len2 = get_ncm(&tmp, opts->dgram_item_len); - if (index2 == 0 || dg_len2 == 0) - break; - /* wDatagramIndex[1] */ - if (ndp_after_header) { - if (index2 < opts->nth_size + opts->ndp_size) { - INFO(port->func.config->cdev, - "Bad index: %#X\n", index2); - goto err; - } - } else { - if (index2 < opts->nth_size + opts->dpe_size) { - INFO(port->func.config->cdev, - "Bad index: %#X\n", index2); - goto err; - } - } if (index2 > block_len - opts->dpe_size) { INFO(port->func.config->cdev, "Bad index: %#X\n", index2); goto err; } - /* wDatagramLength[1] */ - if ((dg_len2 < 14 + crc_len) || - (dg_len2 > frame_max)) { - INFO(port->func.config->cdev, - "Bad dgram length: %#X\n", dg_len); - goto err; - } - /* * Copy the data into a new skb. * This ensures the truesize is correct @@ -1359,6 +1331,8 @@ static int ncm_unwrap_ntb(struct gether ndp_len -= 2 * (opts->dgram_item_len * 2); dgram_counter++; + if (index2 == 0 || dg_len2 == 0) + break; } while (ndp_len > 2 * (opts->dgram_item_len * 2)); } while (ndp_index);