Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp790891rwb; Wed, 9 Nov 2022 08:38:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf4n5pZzqEpTruhgDstZiEPyV4hVfkB2D6HeOhFB0iXHzjs12XJP8WPJCgax/AXiEHoX7E2V X-Received: by 2002:a17:906:a157:b0:7ae:5d04:c96 with SMTP id bu23-20020a170906a15700b007ae5d040c96mr17631716ejb.564.1668011923799; Wed, 09 Nov 2022 08:38:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668011923; cv=none; d=google.com; s=arc-20160816; b=gueYtF1rn0QBzsA5qlynoRvMe46MYrIDyy5Xkz+s2OM1dGCO1lwubNGI1eeMEz9M1+ /k7u1XxXGpxUzRfYzT5uS40nOtWfTrQC0TSJkF2xgtrT6f0YfGng6X41GjYCI5iUAW3J zKE8wlDlphheqg/UGEVgxYRQwjrZg8SX0Q/xklqplf35d5qmp4aXoDwp+QkKkUlBzot1 9MCLgf34dkOo9KrVLdhPXsZ+jztifa3TIgOts/bfD9cgtQDascNYQ/4UI8SreaRzYn1G JD4Z/oTECnzEmqAnibHqx7yzPg6eIhfc3j2Ff5/qKTVLVClOxpqonk/MqxN7kPNG4cXk KhXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=nj4cCIM19NKrNNCDozvlLzQGgoQRFiouvqA6TU9I3vc=; b=jd/yRzqxiKE0hKxnKxLnN7ZqHKxrhh+awmYCrVf1FGG/q5F1OAOvd/qHKkyv0Wdtag UYkedQxftRUUWLaIIL43JVv2DpQgePetPsMo4IJ8wTFh8EVqjF3zaSPo1arxe8/ZugGY UoCmJeE7PX1/W5xkkZ9ggUxzwL3ou92FpoKS2Lb6xx/xt/Eq9kmrSOT9V8M8nNDVESyL zdFYawVc6weu4uTqxaOlzIM4fJQtVqP0UGkjARy8M7x0pz9uTWjXPUqD7IJiQ67zykXm DqFWlDU89jD+6jESF4oCvbQic/0mm8KXdWHkHRzo+S7g0xItOH8elcJlBCQ487wFaG2d j8mw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cw14-20020a170906478e00b007707ab4be28si8799873ejc.972.2022.11.09.08.38.20; Wed, 09 Nov 2022 08:38:43 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231772AbiKIPEA (ORCPT + 92 others); Wed, 9 Nov 2022 10:04:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231147AbiKIPDz (ORCPT ); Wed, 9 Nov 2022 10:03:55 -0500 Received: from netrider.rowland.org (netrider.rowland.org [192.131.102.5]) by lindbergh.monkeyblade.net (Postfix) with SMTP id 78AFCFD17 for ; Wed, 9 Nov 2022 07:03:53 -0800 (PST) Received: (qmail 511314 invoked by uid 1000); 9 Nov 2022 10:03:52 -0500 Date: Wed, 9 Nov 2022 10:03:52 -0500 From: Alan Stern To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Felipe Balbi , Jakob Koschel , Randy Dunlap , Ira Weiny , Linus Torvalds Subject: Re: [PATCH v2] USB: gadget: dummy_hcd: switch char * to u8 * Message-ID: References: <20221109084450.2181848-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221109084450.2181848-1-gregkh@linuxfoundation.org> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,SPF_HELO_PASS,SPF_PASS autolearn=no 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 On Wed, Nov 09, 2022 at 09:44:50AM +0100, Greg Kroah-Hartman wrote: > The function handle_control_request() casts the urb buffer to a char *, > and then treats it like a unsigned char buffer when assigning data to > it. On some architectures, "char" is really signed, so let's just > properly set this pointer to a u8 to take away any potential problems as > that's what is really wanted here. > > Use put_unaligned_le16() to copy the full 16bits into the buffer, > it's not a problem just yet as only 7 bits are being used here, but this > protects us when/if the USB spec changes in the future to define more of > these bits. > > Cc: Felipe Balbi > Cc: Jakob Koschel > Cc: Randy Dunlap > Cc: Ira Weiny > Cc: Alan Stern > Reported-by: Linus Torvalds > Signed-off-by: Greg Kroah-Hartman > --- > v2: - use put_unaligned_le16() on Linus's recommendation as a simpler and > more obvious way to describe the data being copied here. > - update device: comment based on Alan's review > > drivers/usb/gadget/udc/dummy_hcd.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c > index 899ac9f9c279..7c59c20c8623 100644 > --- a/drivers/usb/gadget/udc/dummy_hcd.c > +++ b/drivers/usb/gadget/udc/dummy_hcd.c > @@ -1740,13 +1740,13 @@ static int handle_control_request(struct dummy_hcd *dum_hcd, struct urb *urb, > if (setup->bRequestType == Dev_InRequest > || setup->bRequestType == Intf_InRequest > || setup->bRequestType == Ep_InRequest) { > - char *buf; > + u8 *buf; > /* > - * device: remote wakeup, selfpowered > + * device: remote wakeup, selfpowered, LTM, U1, or U2 > * interface: nothing > * endpoint: halt > */ > - buf = (char *)urb->transfer_buffer; > + buf = urb->transfer_buffer; > if (urb->transfer_buffer_length > 0) { > if (setup->bRequestType == Ep_InRequest) { > ep2 = find_endpoint(dum, w_index); > @@ -1755,10 +1755,9 @@ static int handle_control_request(struct dummy_hcd *dum_hcd, struct urb *urb, > break; > } > buf[0] = ep2->halted; > - } else if (setup->bRequestType == > - Dev_InRequest) { > - buf[0] = (u8)dum->devstatus; > - } else > + } else if (setup->bRequestType == Dev_InRequest) > + put_unaligned_le16(dum->devstatus, buf); This is tempting but wrong. At this point we haven't checked how big the transfer_buffer is; if it is only one byte long then this call will overflow the buffer. Notice the "if" statement three lines below. Alan Stern > + else > buf[0] = 0; > } > if (urb->transfer_buffer_length > 1) > -- > 2.38.1 >