From patchwork Wed Sep 23 19:13:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1370062 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; dmarc=none (p=none dis=none) header.from=gmx.de 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=EXynd5zm; 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 4BxSXJ5xxsz9sSC for ; Thu, 24 Sep 2020 05:14:08 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4949B824BE; Wed, 23 Sep 2020 21:14:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (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="EXynd5zm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 53B63824B8; Wed, 23 Sep 2020 21:14:01 +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,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (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 4F7B3824B8 for ; Wed, 23 Sep 2020 21:13:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (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=1600888436; bh=Rm0bcldsSXOMfytRssPXfZQp/8oHWpfuhgsqyfxcS0I=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=EXynd5zmd3Sk7W3asTjj8RRtyhHBB8IjWYfPD+j6hsOGopL2D6BE6NGmnwurgy1NN 3GIeKilYHeJNomByfuGF8yejvM5r/vP8aoSFge4YJDnpyyBPsCFi2Kz1JV3/MliAyJ 012vt2UkjHYzeO9dLK9TUgkWFO//Sio9hJ1lLlwk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([178.202.41.107]) by mail.gmx.com (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MKsnP-1k2FLt0ttV-00LCxl; Wed, 23 Sep 2020 21:13:56 +0200 From: Heinrich Schuchardt To: Joao Marcos Costa Cc: Thomas Petazzoni , Miquel Raynal , Tom Rini , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] fs/squashfs: parameter check sqfs_read_metablock() Date: Wed, 23 Sep 2020 21:13:51 +0200 Message-Id: <20200923191351.33474-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:oG7kM/n/AS360zdLFd3sgbKiUX4Rni7fSYHLuQcaxNplwj2JL4N 01t2VWnJFjUXgoPN6mGR3J7lsaQX4EDwHUhYSVs5qJrLSfWYa0cLWm+Hs3L8kP0CCUHrc7g qElkIYryP/J5lHWBrRBwOUMoGhlMzcyxEQm+esIY6xjxdvh8iTFvIcWH1csB1xTNMcH6fOt 0xw4Xm2OSDUFgoMzx0pbw== X-UI-Out-Filterresults: notjunk:1;V03:K0:mv64x48vOzk=:n6JCxH5ylyNSPCUAXcbKLH K8e9nzStmvK7TCk1t9flucAqyBaVkcdsqJlHa05ENfs492CiOwXB+D/aLZXguIiTRzKzMIHTv fBpjRe/iJe/H50uSrI1xFEuHmZMAXBJvoDsNczmPgPnDqXhKS9CbNsTx7vavgiF7dbhU4uTlV 6rlqzu9JTTmMiYZxlm0a5UDekUNsL9cn6Mcv/bHRm6W6GjOgOCj0U73zHfvL+lyLaUf2l0MuH 0/+mT2IBTlX1DAYv1821yY5XDw8WYxu+joiQIv+u5CCoHG8t+l1W/hyC4HVy2YVpu05UGELB6 IxbM78yYpcmFi0eA1zxUTb3OafNzzS8vIz9p88IGzVD685riC5z+2T823cmnW6qhvKdW4Ma1d jX2DCwm8Y2c3SOEnqh4Xw/5ZzOYsEVAXspwXZgPcKFppqddEeJNtrgumGacjvT87ZUx6VJrEX Ng99VuI3ssEzX2EwfBe3PPdNoQD0vzmTS8Qrc/koty/uClhMeqastqAZ06Nw+ysRuk16Uso5G N5CEgWuFnt6Uh4dOWo+NZuGzpev7sDxCN1tQL1CJCy9+vRX0YV3Xp1Cs6mmWcIKI/xjF4a+DQ d4ndS5aqJXSWJPvjCdO4agNTpubJsO83RuU13O2A3CcR/S2pMEsWTMxMIZ9l4ucuxdknPqPOM xoaNI1bBKLHJXPn/PqpruC2sbEQ4UML6PYK+nzzf1pvbiA+SlRdMjpRrujR00oyLP/2JYJAi7 hnlF2A9FTUI1Yi79A7Ja0Ez+q+/UgCGmJo0KrbVMtjFoOdDDitoE8O8Uh4h+wYqowYuXAcGEb S8iVpRgg9Pasu7CES//Drohsu8jxfaPUUc6KbGlTBbFG5HJv2BruBcRNtna38LliMhVRKgcBp o6TvhL32cF/rAN2Gm2L1vadC4VENTqIsorn3pMmzmU/VlQcqDdR7NMU7Lhi1ardEvcICUB+RD Udv0Em+9WUOVxrJMB+d/sTZCqPJybFkFXioHI6KX4X01w8CBGQXcMYDXbZoFcNzvalbVwle8S +J5LPT79ze14yzThgKWQV+QW48xLkTVCswtoDg12il2KrVJbRzx8XiKRvyLX5yq1K6MsloE58 hfuijukYo0orZV9L6E8lN0nsWyCw+xvz9hwQ4NfVcIeHOgFxjtFQeeJKXOWg3Gmom8TXr5q/Z viEPmM9rObkvmYNO+qUHtUndkdHxqgiFyml2Ohut/sjQ8SP3XTE5gbGdOLfy1WiNyipjjy5UL /2pmaDFdXcsyUkNBwBnfbyd51/s5MgUGnB2gFbw== 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.3 at phobos.denx.de X-Virus-Status: Clean We should check if the incoming parameter file_mapping is not NULL instead of checking after adding an offset. Reported-by: Coverity CID 307210 Signed-off-by: Heinrich Schuchardt Acked-by: Thomas Petazzoni --- fs/squashfs/sqfs_inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.28.0 diff --git a/fs/squashfs/sqfs_inode.c b/fs/squashfs/sqfs_inode.c index 1368f3063c..14d70cf678 100644 --- a/fs/squashfs/sqfs_inode.c +++ b/fs/squashfs/sqfs_inode.c @@ -141,9 +141,9 @@ int sqfs_read_metablock(unsigned char *file_mapping, int offset, const unsigned char *data; u16 header; - data = file_mapping + offset; - if (!data) + if (!file_mapping) return -EFAULT; + data = file_mapping + offset; header = get_unaligned((u16 *)data); if (!header)