From patchwork Mon Feb 1 02:28:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1434009 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=aEKWuJWZ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DTX2R1QxHz9sxS for ; Mon, 1 Feb 2021 13:29:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A9F2982687; Mon, 1 Feb 2021 03:28:58 +0100 (CET) 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="aEKWuJWZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9EE3182690; Mon, 1 Feb 2021 03:28:56 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (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 827EE82675 for ; Mon, 1 Feb 2021 03:28:53 +0100 (CET) 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=1612146533; bh=DyLkW+osPrZVClLPKnpOq+a1M9EoCb6u2t17Ull/GDA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=aEKWuJWZVfw90jWSl3QO0X1cUg3ReOTKqJGzCAJQIydjKSQYvV0059WHMJuuYyMh0 ZXuB3ScARFwJQ725mng0D9FtO86SNBFBZgHiUxiZJwIeEssehr8eI0LPP/2xgEYIBK r4Tq+2T3zfjV32b8DrTHDZugzghQVlRYdcIO2+sw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.246.89]) by mail.gmx.net (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1N5VDE-1m3J2E3j9m-016x5J; Mon, 01 Feb 2021 03:28:53 +0100 From: Heinrich Schuchardt To: Joao Marcos Costa Cc: Miquel Raynal , Thomas Petazzoni , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] fs/squashfs: NULL dereference in sqfs_closedir() Date: Mon, 1 Feb 2021 03:28:48 +0100 Message-Id: <20210201022848.73381-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:AFmiRd4cevHmEl+zZHBqEGRflLSuFDpOxfGa0RPxIZF5VjQjELy 7Y8tFKgMmiRFn/8wrtWxGoxpru+KaZo5ISSIZf1HOr21bOsuP9tWxq8BlekepSUAprEzU3f SM8TmpRBVsvHs+/bLcCwDdDuvpcv2WvJW+SMRHlI8PxbjKjDFTfmK5xFohEuO0KLd1cTgNv iQKCBFrn4IXDcPUOfMMAg== X-UI-Out-Filterresults: notjunk:1;V03:K0:J1GYVOIgu6Q=:TWM66x+cF3UFJtB/2KUbfJ OZ43dhGUvQIywUP18aG0E6GCbKtjAInq1K8CHafD2J+Fhph0WzCXvnGDRcPvhSMLD5+N9TF4h cHIlRnobIl9WZ+BI/d9+WVWX/JRVccbtb10oA3lOZ8AqZhGGNPieE0lsOuQDZOpAiJ3bNKZ+U e9JOXnH+vsMKtomP4t5m5I6P7TJmTWirN94AKRnxAYtnNzsJGeohKBXRhtEaH6Rz2KDaM/c2V +YwjvPfQJUL2IJ27onY6hGf0w+mpcFH1RWJMCArJbu3J97rLjqi+1CqEI/D4zHXTon411fDL2 Ndoil3D1NJ/DG29cl4lEXoJAro0kfiD47avK0kJe7PxZNOF9GnQer164/lL6g1TwEmXim1Lh/ 4gqPEFicH2Ab9a6OLAPbc6QSob0hvC6wi7ejkU2iNx6dQzZbJ++tZ0NFkcpwa5xTacEWd8ipf 3BiKLWLRqVrpR5Nj06btkP3IlwnJVraE5tCWJ/nRCjOFnJaJg4dT1qlezfEYM/l/m9MVoILp0 6s9i0mECwMHZtNH51Sr4bOU1m10x3NQYQMqVOzWhZZv4OfyJITu3nBtyXB62hAWW5e22eZ4p9 5ZU5txRo8EEFfuG4bZUG1UBsO1DBUUJxvj4/Hn1w8eii3UZ40VfiNTtYrzbikJvEPGFiiBGyo vOkfpWVmplOMF5rBgJwO4PzwDVjQM5aaSRkesgZr4MnLJxp8L10yumkcG474LWGusPbl1AvGl iX63BPdQrDu+JMe/2uNT4UewTE0l0r2h3UDXwC1OoIPYR5Kz3GQPz+l44tj/QHH6atueEZqAm bX1phHoKghGseeaEbWxzpuJk1HagaPi4DzynABpOcj+DbHIosdNSrq7WJZxcQBiMyf7BIZf6T YeT45S7OcZif6lo/edEQ== 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 sqfs_opendir() called in sqfs_size(), sqfs_read(), sqfs_exists() may fail leading to sqfs_closedir(NULL) being called. Do not dereference NULL. Signed-off-by: Heinrich Schuchardt --- fs/squashfs/sqfs.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.29.2 diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index dca13bd1f1..29805c3c6f 100644 --- a/fs/squashfs/sqfs.c +++ b/fs/squashfs/sqfs.c @@ -1716,6 +1716,9 @@ void sqfs_closedir(struct fs_dir_stream *dirs) { struct squashfs_dir_stream *sqfs_dirs; + if (!dirs) + return; + sqfs_dirs = (struct squashfs_dir_stream *)dirs; free(sqfs_dirs->inode_table); free(sqfs_dirs->dir_table);