Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1314568ybz; Wed, 22 Apr 2020 18:20:10 -0700 (PDT) X-Google-Smtp-Source: APiQypJyP5X2V6ACUfALWLCRvjd3/m20EuOFCk4+SRWvKkeQeDQGT02R2MEoXBkhTiWkKMvZ+xdd X-Received: by 2002:aa7:dd95:: with SMTP id g21mr970774edv.148.1587604810186; Wed, 22 Apr 2020 18:20:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587604810; cv=none; d=google.com; s=arc-20160816; b=Ax8XIaDW0/SXNOF6h7DXtvq3LE/M4wm1d3QQEklVcq2fhJwtg/CfLQvYQseYOd9hnr CqDA3Ig8ZKpjT7ZldB2ELiYeBRbRy0k02aaoMPacxJN6P2V00FObTguatcL+ffsBvJPr 2kunj5wON4Cy267AykhC/hom+YD/sW5eJWUz9A1ESICIwAt/VOj9Hsde9/Yg9myQreGn uuK2EjEPekcg/doTFM49F1C0H2YeHEjp0JVfvuQXMZlyXbzdALrkgpKqFYhc40OTYXp0 oYBzlq3PknU3yM1PqWErwGfqOyvDTcjOdacQFzU9JQzjiFjvq6Lu+RPil1h03pcLFfCN cP2w== 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=CA5L6o0fGc1FVtCB5ZZhgM1ZSmzcojhHPhyHSp57p84=; b=t+awEUO4hufi/BucnorRgoVznTieg5TtQQIpHevrLZ7R4oCQwEQ3XcfRKlOQOw2r0L vuxHiXREgqsyJUjeoidhfho75oKutH4rnZiz0CSzbzVQLSLTxcq+37qG964hANUKTF4N uqihgc/YiwTOSHoee3jSQUq8EA36ZcudnIZUWBieWCVPSo/Hcb0QliIw8Sn6pCm9OJug E7GJ5BcfPFS7CF8p3TdkWsVA188r+NnMMDkv0Gh5nwI1PV8vn3Dv3ZhvrOYsZ9nKzlXN tbGG9Z1ZExEry3a7FG16bUQaftF4/moSwnFqxhhE2TBo+M4t82uwH7JH40/SSAYwmoIZ onoQ== 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 t5si444143edi.241.2020.04.22.18.19.47; Wed, 22 Apr 2020 18:20:10 -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 S1726381AbgDWBS0 (ORCPT + 99 others); Wed, 22 Apr 2020 21:18:26 -0400 Received: from netrider.rowland.org ([192.131.102.5]:37697 "HELO netrider.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1726324AbgDWBSZ (ORCPT ); Wed, 22 Apr 2020 21:18:25 -0400 Received: (qmail 8173 invoked by uid 500); 22 Apr 2020 21:18:24 -0400 Received: from localhost (sendmail-bs@127.0.0.1) by localhost with SMTP; 22 Apr 2020 21:18:24 -0400 Date: Wed, 22 Apr 2020 21:18:24 -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: <0000000000001cfc5605a2556fb7@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, 2 Apr 2020, syzbot wrote: > Hello, > > syzbot has tested the proposed patch but the reproducer still triggered crash: > WARNING in usbhid_raw_request/usb_submit_urb > > ------------[ cut here ]------------ > usb 1-1: BOGUS urb xfer, pipe 2 != type 2, pipe 0x80005600, ep attr 0x00, ep addr 0xff This means that the ep_out[0] pointer was NULL. Let's try to find out why. 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 @@ -4437,9 +4437,11 @@ int hub_port_debounce(struct usb_hub *hu void usb_ep0_reinit(struct usb_device *udev) { + udev->alan1 = 2; 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 = 3; } EXPORT_SYMBOL_GPL(usb_ep0_reinit); Index: usb-devel/drivers/usb/core/message.c =================================================================== --- usb-devel.orig/drivers/usb/core/message.c +++ usb-devel/drivers/usb/core/message.c @@ -1198,6 +1198,10 @@ void usb_disable_interface(struct usb_de int i; for (i = 0; i < alt->desc.bNumEndpoints; ++i) { + if ((alt->endpoint[i].desc.bEndpointAddress & 0x0f) == 0) + dev_info(&dev->dev, "Ep 0 is %d in interface %d-%d\n", + i, alt->desc.bInterfaceNumber, + alt->desc.bAlternateSetting); usb_disable_endpoint(dev, alt->endpoint[i].desc.bEndpointAddress, reset_hardware); @@ -1275,6 +1279,8 @@ void usb_disable_device(struct usb_devic mutex_unlock(hcd->bandwidth_mutex); /* Second pass: remove endpoint pointers */ } + if (!skip_ep0) + dev->alan1 = 1; for (i = skip_ep0; i < 16; ++i) { usb_disable_endpoint(dev, i, true); usb_disable_endpoint(dev, i + USB_DIR_IN, true); 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 %d\n", + usb_pipeendpoint(urb->pipe), + urb->dev->alan1, urb->dev->alan2); 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, alan2; int devnum; char devpath[16]; u32 route;