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 47A89C433FE for ; Tue, 22 Nov 2022 08:01:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C8FE985213; Tue, 22 Nov 2022 09:01:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QrdTq61Q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D292B851D5; Tue, 22 Nov 2022 09:01:09 +0100 (CET) Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A208185213 for ; Tue, 22 Nov 2022 09:01:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilin.mikhail.ol@gmail.com Received: by mail-lj1-x244.google.com with SMTP id u2so17074253ljl.3 for ; Tue, 22 Nov 2022 00:01:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gGIEkXyU7diKyJRdEWUOf4cxdQQJNjuXDLOcBrF/orY=; b=QrdTq61Q73nzP1XdpXagUbNxq+UzAszgMT8aExVThSh6n7hH7wANrq+hFXYem0ip2P JP+ZbnGuut03Ln3mgtLapv4QuCcglGxiB5xHqRHCxfg5TGeZb2g4G5Nc6eEal+MDaXSJ wwZks5lsVMSfNLx/tcI6OUIqzSxRAbGzVcQdHRS6b3i/ttPZ5PKy3hA+bF7Nr2ez33kL FZJvoiq5kIfsMOrURp//YNDXrgobwVch/AGehq67wo2rorYT3Yfg429oIZ55KRHy4W5a oZGkh56L6F8pfLfCqY5yEBl2KfGuNR7JwHfV112HVme7krlZleo0YH0GZsXI0qJSDdqB 3nNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gGIEkXyU7diKyJRdEWUOf4cxdQQJNjuXDLOcBrF/orY=; b=IFGQpJVmu9Oaawmw5uVpkeC8TYiem05PYNweSiCvLtfIxqHSUPoZt+e+yoYmFG0azw GYvNRa5opcH1CJGtIRKQrG83Pc/bs6UQ+686oBR8NVUVwyXr3OxTBYy1CJBFKxt4aQaE ncc2VXpfZRWsllrQoTDlQafDQpvXad9wgZRrMAJF1sRUo+fj4tv4meB++mNwDmcrlq2c NmDc89DhKYv9DjeyvP7zj/CvSw4S+FNl8r5ru7Gr7FNnSbUxMAglW7jmXqugweOZ/Shu guWa0ih53RJksVVQpgHuEK7qlY+4HDC6Dpnu4Ews0oJ147sbg5YBqrdPAuA1o0fFF5C4 MNdQ== X-Gm-Message-State: ANoB5pmhFn42hwlFmX5FioQswVbFpf7L512dB23ba0q5pI/b1xUk5cqZ GhLbJRoR+U6gJ4DyrP8FttRV/N+W23c= X-Google-Smtp-Source: AA0mqf5pR3fK4bV3DKFSpdBMIVVEAR3IFJyl9iq4Mnrm/M6UpmM1R0k3w5KB8S53Kv5WnROVWmKXDg== X-Received: by 2002:a2e:3a1a:0:b0:278:f073:d3c0 with SMTP id h26-20020a2e3a1a000000b00278f073d3c0mr7618722lja.357.1669104066496; Tue, 22 Nov 2022 00:01:06 -0800 (PST) Received: from milin-wrk.rasu.local ([178.70.40.200]) by smtp.gmail.com with ESMTPSA id d4-20020ac25444000000b004b15bc0ff63sm2339127lfn.277.2022.11.22.00.01.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 00:01:05 -0800 (PST) From: Mikhail Ilin To: u-boot@lists.denx.de Cc: Mikhail Ilin Subject: [PATCH] fs: ext4: Fix free(NULL) The 'depth_dirname', 'ptr', 'parent_inode' and 'first_inode' pointers may be null. Thus, it is necessary to check them before using free() to avoid free(NULL) cases. Date: Tue, 22 Nov 2022 11:00:55 +0300 Message-Id: <20221122080055.4973-1-ilin.mikhail.ol@gmail.com> X-Mailer: git-send-email 2.17.1 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.6 at phobos.denx.de X-Virus-Status: Clean Fixes: 934b14f2bb30 ("ext4: free allocations by parse_path()") Signed-off-by: Mikhail Ilin --- fs/ext4/ext4_common.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 5bf78b530a..422497c257 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -847,15 +847,20 @@ end: fail: free(depth_dirname); - free(parse_dirname); - for (i = 0; i < depth; i++) { - if (!ptr[i]) - break; - free(ptr[i]); + if (parse_dirname) + free(parse_dirname); + if (ptr) { + for (i = 0; i < depth; i++) { + if (!ptr[i]) + break; + free(ptr[i]); + } + free(ptr); } - free(ptr); - free(parent_inode); - free(first_inode); + if (parent_inode) + free(parent_inode); + if (first_inode) + free(first_inode); return result_inode_no; } -- 2.17.1