From nobody Mon Feb 9 07:55:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+97270+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97270+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1670856432; cv=none; d=zohomail.com; s=zohoarc; b=RVNWXVE2iXXDBV3wTZeXS3VsREDdWdVvUQO75WxEV1sxAHx+GtFHvjxyLvDp4In5f2WRM5rmYfNYXr8pGJwlGL+wLBkOOyd3jwuBxHfHDCz9Wukw7r/nDgR7aY02/YKe7yGVnN+e8n2aLJ9YaijQXJAZan6PINkkYT2Xbe9FeAo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670856432; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=D/eHBvrgq8NQ1uLHefqtZWezZvFOHvQzxrBtcUce3Hc=; b=IztUz/emdgM8/YYwWPWi0/trT5XWJ2bJxER4qyJROnK9m46p8wQAPgUvocSaT9g4NAzUZGpLkuhN8sIb22K1gjqKC6tI6ZHxkfVWRHuS0SBFvX/oiBLGhVTt+P/8wDlfOz0Dz1NCZcYfJxLquhJePHmzetcIGyMkMLmSc1GJlpw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97270+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1670856432741664.4403085270036; Mon, 12 Dec 2022 06:47:12 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id XegDYY1788612x1OihsmoUog; Mon, 12 Dec 2022 06:47:11 -0800 X-Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by mx.groups.io with SMTP id smtpd.web10.44810.1670856431021873589 for ; Mon, 12 Dec 2022 06:47:11 -0800 X-Received: by mail-lf1-f47.google.com with SMTP id p8so18950657lfu.11 for ; Mon, 12 Dec 2022 06:47:10 -0800 (PST) X-Gm-Message-State: 6u8MlGVm7s7MV59lDS20qKolx1787277AA= X-Google-Smtp-Source: AA0mqf4gA7I0zVKKyWlEg608DGJ1eTlfsW/Xo4riL6vhJ4lQcehGR4IhVx1aNPjuYfL3IumlFQ9h5g== X-Received: by 2002:a05:6512:3c88:b0:4b5:2f1e:7d3b with SMTP id h8-20020a0565123c8800b004b52f1e7d3bmr6009314lfv.33.1670856429197; Mon, 12 Dec 2022 06:47:09 -0800 (PST) X-Received: from localhost.localdomain ([77.221.215.144]) by smtp.gmail.com with ESMTPSA id t4-20020a056512030400b0049c29292250sm1643313lfp.149.2022.12.12.06.47.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 06:47:08 -0800 (PST) From: "Savva Mitrofanov" To: devel@edk2.groups.io Cc: =?UTF-8?q?Marvin=20H=C3=A4user?= , Pedro Falcato , Vitaly Cheptsov Subject: [edk2-devel] [edk2-platforms][PATCH v2 10/11] Ext4Pkg: Check VolumeName allocation correctness in Ext4GetVolumeName Date: Mon, 12 Dec 2022 20:46:53 +0600 Message-Id: <20221212144654.2650-11-savvamtr@gmail.com> In-Reply-To: <20221212144654.2650-1-savvamtr@gmail.com> References: <20221212144654.2650-1-savvamtr@gmail.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,savvamtr@gmail.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1670856431; bh=e1EO0OwJoRlIjv1fwHOza8Em9/KYG2bN9HfrhW3wpTw=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=kwU94z17HllkVJ3XfTYxcYIHESeUTpeKvH/w1KOcoHkDrlelPSJOjexDvqFh45CxDBh pGq7skUcY7IGHPK064BK4r0hnJv9UGhS91fplgrj+OfW2SyDwgirFh1ojbwvJqhlLHVuJ Z3b+zV/JyOV3EEZqwdDOjWXrn3rkpNmcXbI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1670856434316100044 Content-Type: text/plain; charset="utf-8" Missing check in some cases leads to failed StrCpyS call in Ext4GetVolumeLabelInfo. Also correct condition that checks Inode pointer for being NULL in Ext4AllocateInode Cc: Marvin H=C3=A4user Cc: Pedro Falcato Cc: Vitaly Cheptsov Fixes: e55f0527dde48a5f139c1b8f35acc4e6b59dd794 Signed-off-by: Savva Mitrofanov --- Features/Ext4Pkg/Ext4Dxe/File.c | 10 ++++++++-- Features/Ext4Pkg/Ext4Dxe/Inode.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Features/Ext4Pkg/Ext4Dxe/File.c b/Features/Ext4Pkg/Ext4Dxe/Fil= e.c index 20a0194a5793..085cb7236957 100644 --- a/Features/Ext4Pkg/Ext4Dxe/File.c +++ b/Features/Ext4Pkg/Ext4Dxe/File.c @@ -719,7 +719,11 @@ Ext4GetVolumeName ( =20 VolNameLength =3D StrLen (VolumeName); } else { - VolumeName =3D AllocateZeroPool (sizeof (CHAR16)); + VolumeName =3D AllocateZeroPool (sizeof (CHAR16)); + if (VolumeName =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } + VolNameLength =3D 0; } =20 @@ -786,7 +790,9 @@ Ext4GetFilesystemInfo ( Info->VolumeSize =3D MultU64x32 (TotalBlocks, Part->BlockSize); Info->FreeSpace =3D MultU64x32 (FreeBlocks, Part->BlockSize); =20 - StrCpyS (Info->VolumeLabel, VolNameLength + 1, VolumeName); + Status =3D StrCpyS (Info->VolumeLabel, VolNameLength + 1, VolumeName); + + ASSERT_EFI_ERROR (Status); =20 FreePool (VolumeName); =20 diff --git a/Features/Ext4Pkg/Ext4Dxe/Inode.c b/Features/Ext4Pkg/Ext4Dxe/In= ode.c index 5ccb4d2bfc42..2977238d687c 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Inode.c +++ b/Features/Ext4Pkg/Ext4Dxe/Inode.c @@ -230,7 +230,7 @@ Ext4AllocateInode ( =20 Inode =3D AllocateZeroPool (InodeSize); =20 - if (!Inode) { + if (Inode =3D=3D NULL) { return NULL; } =20 --=20 2.38.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#97270): https://edk2.groups.io/g/devel/message/97270 Mute This Topic: https://groups.io/mt/95622339/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-