From patchwork Mon Apr 5 00:06:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1462169 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=JvtQd0k8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FD9ts2ZmLz9sSC for ; Mon, 5 Apr 2021 10:06:45 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7D4988166D; Mon, 5 Apr 2021 02:06:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="JvtQd0k8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 588B281691; Mon, 5 Apr 2021 02:06:34 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 61FDC8092A for ; Mon, 5 Apr 2021 02:06:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1617581188; bh=b08C8F/plUTpyqfW/0Ak3Eoo0qY19YCUCrkAlpaEfwY=; h=X-UI-Sender-Class:To:From:Subject:Cc:Date; b=JvtQd0k8KC0ZjcMzGKrMKN3BkshaSO+i5rLaU/FP6fIoPKzRXWjThXD5Rhe9DsQy+ o8TggpbHd6saZk2OUDzm8/WMr0DyvMzSVNuXeO/ShfFFRgedsHuJ7cN8hrKUL7VcOA QuYwxkXqA2wfyUCnSJk7g64NG5phghqcwS8iqc64= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [192.168.123.35] ([62.143.247.63]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MJVHU-1l9LWm2Vaa-00JpHb; Mon, 05 Apr 2021 02:06:28 +0200 To: Marek Vasut From: Heinrich Schuchardt Subject: [RFC] musb_bulk_rx_nak_timeout() Cc: U-Boot Mailing List , Ilya Yanok , Sean Anderson , Simon Glass Message-ID: Date: Mon, 5 Apr 2021 02:06:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 Content-Language: en-US X-Provags-ID: V03:K1:EfeVeKaud7ohewFLybKK96+ZnKAqzl+5WmaccgHCMUr5KApag6Y 5Wd02eRJcv6sTdgRF9PyT0rM6qP3oOLDNONEN+RSM6Y5YmaiF/wPp+w4j7lhp27SanJLrUk xDCIP9+uCWpALT1r8ElIv9sLjq9Gueo3dvCjrLNtujcpV+sermlLDRX8ODUnUPR+uhoEYPg A6Jqvf62FHYkQAS7pXOpA== X-UI-Out-Filterresults: notjunk:1;V03:K0:SUjRav/amqE=:MvF/Lyr5xsl6xS5WHnd/Fk Xx0AuWijTmtEntGbjbpUp6/1aSfelFqqprJi0/2Wh3BlpL75tqH/vpo+pMiAs4LqGajb8SY3T emg5Wm03NZtzLjZs/coSB0FH6N2VQHhCvfVebMCMvOXL+JJySmST6m7FGVkJA7EVsZ7moaxHp HZ6om1r1gV/aO8d0Kmf+2Tr2XFGdtPlmv0LdOMWZfb12A4MGQ851NRK3/HBfnzHLsVoZLPlwS 83SsVN/3v9q5osOE3HVTexvAoot4IlF1qVMrwvQDWWJyrpyG4XZkBhJh4Pgv70jKA80m1uiPW mz/+8JOElxAjSt96QL4zNgW//H+sE8IKS0Ch+0AnvUNP6KV3wGWfDgMFUicnMFqXLECnnqNm+ wwmbkLEoRguT0VVPXn5whML5GwrBD7sWtK2Tm4+tvu8NmK4WD50LjMmvZDDqzu/5jwsrqMd43 K1rrbZ4kOT+fcU2TDauxGjBXYTRAaRQ7Vav1r/zpayrqCMdN2OJXODG9a7DnkgKoBFN4jsuoo GKDMeBsJdOWAp35JyTqlC+DjBI+50Y1x/IFTfbLy7sesAbEuhwxSf8Pxts/F56J7NaowfuoqD 3R3E/8rZnEoujGMYwYXN3dnCAmiHqiMwJ7ElMhV8tbTnahP1BVgc1esJ+oAXr9qbbCPlap0ut OUWhBoy1uuaWXbo10/C/mXsC4iDaVs95Nv+sVIYyRWJmQZbfcNiEvqYq5hinLOWGywuBdGFv2 2CRg/PcYTrwjqGFmJTxpo9ff8DjdBb6xn/4JOCMyCFGHZak9q0OBm07S+Wgxi1Tes+1uUx+9Z qf2sgFHrXm4kxtGzkaD9rV8DG9SJFD+XNb9vJ8+A0BnuweMz4cLy++Qnyq6AzHHheg/GEVQQt R3TDMQsnzcDVKf51AnXR0XWZgqnOFdBXjyS6jWOQJMXTjNtW7qU4NDzjZDgPSzbrBPzql1kLK yRK663Hh8IDz38kVFy8MEZ+APk2iMA95ippa1BQPWZ/3FvkAU6ecVmKJPJh5JRvIl72YDUu0I O35ivgJo8XZzvFZZForSmxsKMoWw5a/Ad17220yV8Na++ev60No4cNKHJ/MuUFWC5HR9UKG9l aYtJ6rIT7/ed0OVHwwWah8yGAR68XmVVhvuQmRsHcCQLqexClK6whkiI18LAigwXACKL+nlfu GmNJrNLC94mFzm6yEZaxplJ9iLjzEMErN+ktzslGgxoW2rINbh52z+Po5MgRpv1QGniuw= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Hello Marek, the code in musb_bulk_rx_nak_timeout() looks fishy: dma may be set to NULL and dereferenced afterwards. The following change would avoid the NULL dereference but I am not deep enough into the code to evaluate what is intended here: musb->dma_controller->channel_abort(dma); urb->actual_length += dma->actual_len; Best regards Heinrich diff --git a/drivers/usb/musb-new/musb_host.c b/drivers/usb/musb-new/musb_host.c index acb2d40f3b..f495a23d57 100644 --- a/drivers/usb/musb-new/musb_host.c +++ b/drivers/usb/musb-new/musb_host.c @@ -1409,7 +1409,7 @@ static void musb_bulk_rx_nak_timeout(struct musb *musb, struct musb_hw_ep *ep) cur_qh = first_qh(&musb->in_bulk); if (cur_qh) { urb = next_urb(cur_qh); - if (dma_channel_status(dma) == MUSB_DMA_STATUS_BUSY) { + if (dma && dma_channel_status(dma) == MUSB_DMA_STATUS_BUSY) { dma->status = MUSB_DMA_STATUS_CORE_ABORT;