Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp47587ybz; Thu, 23 Apr 2020 18:03:46 -0700 (PDT) X-Google-Smtp-Source: APiQypJP+0XW5YEoth24lApz0Accaxj6juG4JvbmiesxEibFASr1icvdTfUkp+20priW9+M8M0nb X-Received: by 2002:a05:6402:333:: with SMTP id q19mr5345309edw.186.1587690226700; Thu, 23 Apr 2020 18:03:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587690226; cv=none; d=google.com; s=arc-20160816; b=RElUvt2CNPDq6w6V0anq5ZArFDemYxWIYcEA+JvEbeyuxBjUrTIKN1OfkqBHi+ztbw YIGxnv2gGn1KWsOL7xjD5vlnnSEn2xZBO/h7EF97B3RhaZluYjVx8EUKRXuYrkYt0RCK URidREwu7+CzG/D8rp/IRSf5gsVQFbM3s1ibEWJtFeXl8Q85A7rM+5Dx2kPPGEjZaVUV y4tPQ63RajBCSc49JTzsh6e+/vUAuauOeHcb5EPwwS2RfkbSe6+GJ0uoqR2Qn+q6gGcx vPAcNzkvCrYv6pLUar+z+RE7XjZZHKovPEllu16DiX7wWELagMnc+2R86o7pj2TUsTGN hzRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:in-reply-to :subject:cc:to:from:date; bh=FiWsLDANcicr8mi2+ux/gggnU3AW/utHMpyV85T9RMU=; b=ox9zHium2jC1ls1poihA0yz1We5OT0MaKIIq2VMdHS1wMPKudT8gGLTpq+b5KKWr5I T5AdQxWV9IzEIV8WEfQP0DJ/nURmze5v3B0uDzfaDduB7Ng4+rziifEVuGdu7WRgxziY Z7NHABl1B/5l7uvGtNeA+dB1PVdv/wsVlBEm5zzngg1JqG573plOwr9GjNRjIymbil7b wTsiYXEpj+qObPHRrJlrvGIzvMZKntY12u27jGQThxpEeQjZTh6rJDDztWhO3qh/VpCL kORHUR4FQ+GI0usbGA5ZPONlG55cCStNKnrLQGvJOJQh4npe7s6vqEt/HNmm1tRZUG9j dSJA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m26si2118890edp.0.2020.04.23.18.03.18; Thu, 23 Apr 2020 18:03:46 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728301AbgDXBA7 (ORCPT + 99 others); Thu, 23 Apr 2020 21:00:59 -0400 Received: from netrider.rowland.org ([192.131.102.5]:46621 "HELO netrider.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1726060AbgDXBA7 (ORCPT ); Thu, 23 Apr 2020 21:00:59 -0400 Received: (qmail 2364 invoked by uid 500); 23 Apr 2020 21:00:58 -0400 Received: from localhost (sendmail-bs@127.0.0.1) by localhost with SMTP; 23 Apr 2020 21:00:58 -0400 Date: Thu, 23 Apr 2020 21:00:58 -0400 (EDT) From: Alan Stern X-X-Sender: stern@netrider.rowland.org To: syzbot cc: andreyknvl@google.com, , , , , Subject: Re: WARNING in usbhid_raw_request/usb_submit_urb (3) In-Reply-To: <000000000000c06f9105a3fc3ed2@google.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 23 Apr 2020, syzbot wrote: > Hello, > > syzbot has tested the proposed patch and the reproducer did not trigger crash: Okay, try again. Alan Stern #syz test: https://github.com/google/kasan.git 0fa84af8 Index: usb-devel/drivers/usb/core/hub.c =================================================================== --- usb-devel.orig/drivers/usb/core/hub.c +++ usb-devel/drivers/usb/core/hub.c @@ -4440,6 +4440,7 @@ void usb_ep0_reinit(struct usb_device *u usb_disable_endpoint(udev, 0 + USB_DIR_IN, true); usb_disable_endpoint(udev, 0 + USB_DIR_OUT, true); usb_enable_endpoint(udev, &udev->ep0, true); + udev->alan1 = 0; } EXPORT_SYMBOL_GPL(usb_ep0_reinit); @@ -4471,6 +4472,7 @@ static int hub_set_address(struct usb_de update_devnum(udev, devnum); /* Device now using proper address. */ usb_set_device_state(udev, USB_STATE_ADDRESS); + udev->alan1 = 1; usb_ep0_reinit(udev); } return retval; @@ -4838,6 +4840,7 @@ hub_port_init(struct usb_hub *hub, struc else dev_warn(&udev->dev, "Using ep0 maxpacket: %d\n", i); udev->ep0.desc.wMaxPacketSize = cpu_to_le16(i); + udev->alan1 = 2; usb_ep0_reinit(udev); } @@ -5226,6 +5229,7 @@ static void hub_port_connect(struct usb_ loop_disable: hub_port_disable(hub, port1, 1); loop: + udev->alan1 = 3; usb_ep0_reinit(udev); release_devnum(udev); hub_free_dev(udev); @@ -5762,10 +5766,14 @@ static int usb_reset_and_verify_device(s bos = udev->bos; udev->bos = NULL; + dev_info(&udev->dev, "Device reset\n"); + dump_stack(); + for (i = 0; i < SET_CONFIG_TRIES; ++i) { /* ep0 maxpacket size may change; let the HCD know about it. * Other endpoints will be handled by re-enumeration. */ + udev->alan1 = 4; usb_ep0_reinit(udev); ret = hub_port_init(parent_hub, udev, port1, i); if (ret >= 0 || ret == -ENOTCONN || ret == -ENODEV) Index: usb-devel/drivers/usb/core/urb.c =================================================================== --- usb-devel.orig/drivers/usb/core/urb.c +++ usb-devel/drivers/usb/core/urb.c @@ -204,8 +204,12 @@ int usb_urb_ep_type_check(const struct u const struct usb_host_endpoint *ep; ep = usb_pipe_endpoint(urb->dev, urb->pipe); - if (!ep) + if (!ep) { + dev_info(&urb->dev->dev, "Ep %d disabled: %d\n", + usb_pipeendpoint(urb->pipe), + urb->dev->alan1); return -EINVAL; + } if (usb_pipetype(urb->pipe) != pipetypes[usb_endpoint_type(&ep->desc)]) return -EINVAL; return 0; Index: usb-devel/include/linux/usb.h =================================================================== --- usb-devel.orig/include/linux/usb.h +++ usb-devel/include/linux/usb.h @@ -629,6 +629,7 @@ struct usb3_lpm_parameters { * usb_set_device_state(). */ struct usb_device { + int alan1; int devnum; char devpath[16]; u32 route;