Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2E799C433EF for ; Fri, 28 Jan 2022 03:39:26 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EB243835F4; Fri, 28 Jan 2022 04:39:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1643341164; bh=KqH7KhgmhtchHzN/e1eFRLwvOzmk6rFRGDiLwkIKME4=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=RanT60JELrOMsLCbCtRo+rtiGlmJFEQoEYjWlxpeqRKhowq8DgAHe7G9nLiUqRaVT iaVutLgqE+5GRI323ciumWkuhA6T2SLfEZr7xd3EvKM3KB9v0l4u+9qDSyp5iibcKb S/J/nb54OgtRkR+Lb4z86zzHnHqjPXYVSyzqh0MRZaILky+55sOya2qwtgeTgeTr7c h3Mmx4u0OdNZooYaeDA4fE/0QgjXKizIdphqogwJmCFEVtm2TTB/30ImhQyQNwSOSe gjQ090Qp2prfNcdML8Dggxx5vhtT1M4kC+989AuuBC7UEeeTrfKywQrA3X4sFZLj6Y DTVyCwcvDevyw== Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id C18928349B; Fri, 28 Jan 2022 04:39:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1643341162; bh=KqH7KhgmhtchHzN/e1eFRLwvOzmk6rFRGDiLwkIKME4=; h=From:To:Cc:Subject:Date:From; b=f67fEJnfLiopQ9Lp0peRr4slbhlTobO6+qtBME7kXhq1te7H6cORhk0vgPrEn965v ITSiZ6LbyP9TH2zyI01BgRRKy3D2indDa4bNZ/HDdC78WjRrijZawyr+kxQDIoZ/1a 84j0WUsAtKW1A4jsnV1Q36GA5A726AGIxM8CJNjKFgwHI74kUuIcriV4QHthxl0QGi +cvAXkByTQw1fWfv8iTPBElY7tmIo6vokGzjsHI/MADAszDkQCl67I5sZcOEHAbC8k RPPSojJPfCMXXN17msNWzxeaX0Kud62eJHHiHn45/sjRb0MbUlpof0YZdhmtwFvltu yWlqKQ/2IPYBQ== From: Marek Vasut To: u-boot@lists.denx.de Cc: sbabic@denx.de, Marek Vasut , Peter Chen , Li Jun , Peng Fan Subject: [PATCH] usb: gadget: ci: Avoid null pointer dereference Date: Fri, 28 Jan 2022 04:39:09 +0100 Message-Id: <20220128033909.1410678-1-marex@denx.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.5 at phobos.denx.de X-Virus-Status: Clean The ci_req->hw_buf can be NULL, test whether it is and if so, avoid accessing it. Else, the system may crash. Signed-off-by: Marek Vasut Cc: Peter Chen Cc: Li Jun Cc: Peng Fan --- drivers/usb/gadget/ci_udc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index 226a9e6d671..542684c1c30 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -402,6 +402,9 @@ align: flush: hwaddr = (unsigned long)ci_req->hw_buf; + if (!hwaddr) + return 0; + aligned_used_len = roundup(req->length, ARCH_DMA_MINALIGN); flush_dcache_range(hwaddr, hwaddr + aligned_used_len); @@ -415,7 +418,7 @@ static void ci_debounce(struct ci_req *ci_req, int in) unsigned long hwaddr = (unsigned long)ci_req->hw_buf; uint32_t aligned_used_len; - if (in) + if (in || !hwaddr) return; aligned_used_len = roundup(req->actual, ARCH_DMA_MINALIGN); -- 2.34.1