From patchwork Mon Mar 13 15:45:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 68906 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1268449wrd; Mon, 13 Mar 2023 09:05:07 -0700 (PDT) X-Google-Smtp-Source: AK7set+uUEkGMZrgp+i+5iS4iegGDBmIZXTBhEbLMTyI43oDD9YAKnOBiZuQ2nqwAt5DDXfiLDTC X-Received: by 2002:a17:90a:1a1a:b0:237:3dfb:9095 with SMTP id 26-20020a17090a1a1a00b002373dfb9095mr35236044pjk.6.1678723506816; Mon, 13 Mar 2023 09:05:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678723506; cv=none; d=google.com; s=arc-20160816; b=iZ5mmK8mRv4pvUuEbHVPEwvgbG3kjpbdO2cNOyxb7zqsLY3jgvf36gjcfA7mLy1pI1 5YZ6xJ6gLDIRnzmZ6FYwwRfLpenR8dSwndlUVsWCBLbL/vHQYeProC+K6BVV/RCNvKhF 5jHG+A1enLbgy9q5rkgO6zJKSYEzKlo4BHfZSGvkuSKMK3TbnNWussuUAuhTA/4AcG1u E+VBwKrJBUCaFRa+VeO3Wszt/88F8kl7xwxQoD8DrPTGfQoG1rvlrxwzZ/I1M7KzAQoI N6Ww5yxmXE2tYWlh+lJYKaUO2ICdauzYndN1ju1g1PCk8GTcYBireCFH7v09Dv0Y39tM LP0A== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=fuuvLuXY1WXAtg4Yf4XLwVjaZxDUslBTVBpgPa8BvPA=; b=c7eA2wGw0PDmGo/GasqsVt/EdI3JCCvQswSLBax5FNMSrIzGYSGmdN9m9+yHaYly9/ Qx4Fhrc0Sdt/rrgAOTYtEWvCMBSIxxHj6QUX1Q11HHFaLQSecBb6frnKtVMcXwwCA+NS 5IcR0/1MzO8uMmSvWGIqaYNeeAovmwlj8nDMmA8KF3wpBbLXcjcjH8plJTKzIEEt5yub /vR/M083arciBCWXGbA64ynk+7fyg9jwvYi3sXkJj9bVDuWCx+58zCznrAU+kFBeASGU U1Jr/FA7pJuqNAICNMcr+G8IJUQIKOrOHCSaOpPthtjpBFrTwVjPxlHKteJZZRsjPG5c E2nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fqGzaoeO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g1-20020a632001000000b004fb988c78f0si6881703pgg.242.2023.03.13.09.04.49; Mon, 13 Mar 2023 09:05:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fqGzaoeO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229749AbjCMPoz (ORCPT + 99 others); Mon, 13 Mar 2023 11:44:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229540AbjCMPox (ORCPT ); Mon, 13 Mar 2023 11:44:53 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C56434031; Mon, 13 Mar 2023 08:44:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678722293; x=1710258293; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=LjDvHTVQePXvglarBOFK7GWK0Gk9FTqTCiXJf74BQlA=; b=fqGzaoeOfp2T/M+8AWjhXO3T/lgS5dOYxqjuRK/6eAKaKPJotf2VzXH9 1RfrD4xsn4xaJ2zmHA5sfTB2GKF0lQ2yfDmJTS780/7/XPj9MA1PVUFQu FJtxmaB3YsVESBfelT65NKXfFEF7R0lxeTaf2eXwnp+eZStLqvm4NtOnd nEQvHAsgx/hlnTGiIzeqAYKxlqI1GOgR8ZDl+6MCIi29WZNtwVj5oyf0Y zja1lOGjGEErKlG1nJU/BL73Dbw8g76DRUhB/JXA0wH8Jk7RChNDE2lkz aaJeqFAXUPNgyXkfDLLPkiIhDRnv6sDabq1LUqdLn9liARDfk9yiDbIGM g==; X-IronPort-AV: E=McAfee;i="6500,9779,10648"; a="399773126" X-IronPort-AV: E=Sophos;i="5.98,257,1673942400"; d="scan'208";a="399773126" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2023 08:44:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10648"; a="678717857" X-IronPort-AV: E=Sophos;i="5.98,257,1673942400"; d="scan'208";a="678717857" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 13 Mar 2023 08:44:50 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 4945C365; Mon, 13 Mar 2023 17:45:35 +0200 (EET) From: Andy Shevchenko To: Greg Kroah-Hartman , =?utf-8?b?SsOzIMOBZ2ls?= =?utf-8?b?YSBCaXRzY2g=?= , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1 1/1] usb: gadget: Use correct endianness of the wLength field for WebUSB Date: Mon, 13 Mar 2023 17:45:22 +0200 Message-Id: <20230313154522.52684-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760269179852380302?= X-GMAIL-MSGID: =?utf-8?q?1760269179852380302?= WebUSB code uses wLength directly without proper endianness conversion. Update it to use already prepared temporary variable w_length instead. Fixes: 93c473948c58 ("usb: gadget: add WebUSB landing page support") Signed-off-by: Andy Shevchenko Tested-By: Jó Ágila Bitsch --- drivers/usb/gadget/composite.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index fa7dd6cf014d..5377d873c08e 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -2079,10 +2079,9 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) sizeof(url_descriptor->URL) - WEBUSB_URL_DESCRIPTOR_HEADER_LENGTH + landing_page_offset); - if (ctrl->wLength < WEBUSB_URL_DESCRIPTOR_HEADER_LENGTH - + landing_page_length) - landing_page_length = ctrl->wLength - - WEBUSB_URL_DESCRIPTOR_HEADER_LENGTH + landing_page_offset; + if (w_length < WEBUSB_URL_DESCRIPTOR_HEADER_LENGTH + landing_page_length) + landing_page_length = w_length + - WEBUSB_URL_DESCRIPTOR_HEADER_LENGTH + landing_page_offset; memcpy(url_descriptor->URL, cdev->landing_page + landing_page_offset,