From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by mx.groups.io with SMTP id smtpd.web10.98483.1674811796503971478 for ; Fri, 27 Jan 2023 01:29:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=I4nKxXlZ; spf=pass (domain: gmail.com, ip: 209.85.167.43, mailfrom: savvamtr@gmail.com) Received: by mail-lf1-f43.google.com with SMTP id br9so7244170lfb.4 for ; Fri, 27 Jan 2023 01:29:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=h7o6UY7pgttmVPl/OuXvEAJbYm6Ksaqc9+5ljbN0NwQ=; b=I4nKxXlZzzyNJSH30dVmfOkajxoiCklA28O3Nxn7psy8hzh3o1YVOvZbM/HrwaLkah ojEuCxzlGTUX4C+FBTcIDegcEqtH3rV6GVF6ttFJl7ixMEmQ/fwUxOs9AzIlyHE/PADu n5pYLKQx0j0hfih++OALv0UuWn3mOIyfcWZq4kd7xJ9Vvqji+0qS3yGsUc67NWSlCLdG yFWU2DDe/ffVXjT0v1XpZEZG22D1wbmZWzAusDH+enxYMo+6kH4Y2T7TAl9EUn/veIZp qvdUXibZdxu02JVtEtiNxHUaEKypK8IvZssHYRKvGIVKz2ym5sv2EwM/yeG8NVJceuBA ZeJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h7o6UY7pgttmVPl/OuXvEAJbYm6Ksaqc9+5ljbN0NwQ=; b=FEKVJ91cPdZ/kty5Drm0hH+Nq+BGx1FsNbKQBZJ6OGJE9Xrv4e6bqoK4HXREYUL1Wb r0XLTdpUsG5t6hG+YrLCa3JV79SOxkmZ3BUsA3EEbh9ZlF0iJ8S0NJJaQZjdmY4mYtZf 6+wu5C8uS2ARuLo89oYvM3lC9mIwa4BiH9QARWYNyzQhwHfMPVrKyo2aZJ1ugStPgM91 7nmeBMACYJ/Ib8y0h9+WuSQglnFRsd/ZbB0HpbmyEzaSYNzr4xNMBYtkrc+70cDwc1jf BQOO5Jzh22be2QcFub0MSSnvWNZ7tXd+sL7Q1mSktjB55TJR5x37EkhFgOefoEQlUCxF SeHg== X-Gm-Message-State: AFqh2kqk07YldWGDfvIUdiSjAFJd9i+rWjVcC+7JZVbRP3hxWP1NuGo9 NK0QZ5wXoq/4RxmEz1NMsDKCBxjwVeX2xk6V X-Google-Smtp-Source: AMrXdXuBlZN+3uRDNHi0ye/5ic9zI85kn/yeSBSFdJ6bd2jPiFfV79lBCq5gTjdK9+qFJ8mqukVxuQ== X-Received: by 2002:ac2:44d5:0:b0:4cc:8572:c7bc with SMTP id d21-20020ac244d5000000b004cc8572c7bcmr9270934lfm.65.1674811794634; Fri, 27 Jan 2023 01:29:54 -0800 (PST) Return-Path: Received: from localhost.localdomain ([176.62.67.29]) by smtp.gmail.com with ESMTPSA id t11-20020a056512068b00b004cc8196a308sm229071lfe.98.2023.01.27.01.29.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 27 Jan 2023 01:29:54 -0800 (PST) From: "Savva Mitrofanov" To: devel@edk2.groups.io Cc: =?UTF-8?q?Marvin=20H=C3=A4user?= , Pedro Falcato , Vitaly Cheptsov Subject: [edk2-platforms][PATCH v3 08/11] Ext4Pkg: Check VolumeName allocation correctness in Ext4GetVolumeName Date: Fri, 27 Jan 2023 15:29:42 +0600 Message-Id: <20230127092945.94389-9-savvamtr@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230127092945.94389-1-savvamtr@gmail.com> References: <20230127092945.94389-1-savvamtr@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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: cfbbae595eec ("Ext4Pkg: Add handling of EFI_FILE_SYSTEM_VOLUME_LABEL= GetInfo().") 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 9dde4a5d1a2d..677caf88fbdc 100644 --- a/Features/Ext4Pkg/Ext4Dxe/File.c +++ b/Features/Ext4Pkg/Ext4Dxe/File.c @@ -719,7 +719,11 @@ Ext4GetVolumeName ( =0D VolNameLength =3D StrLen (VolumeName);=0D } else {=0D - VolumeName =3D AllocateZeroPool (sizeof (CHAR16));=0D + VolumeName =3D AllocateZeroPool (sizeof (CHAR16));=0D + if (VolumeName =3D=3D NULL) {=0D + return EFI_OUT_OF_RESOURCES;=0D + }=0D +=0D VolNameLength =3D 0;=0D }=0D =0D @@ -786,7 +790,9 @@ Ext4GetFilesystemInfo ( Info->VolumeSize =3D MultU64x32 (TotalBlocks, Part->BlockSize);=0D Info->FreeSpace =3D MultU64x32 (FreeBlocks, Part->BlockSize);=0D =0D - StrCpyS (Info->VolumeLabel, VolNameLength + 1, VolumeName);=0D + Status =3D StrCpyS (Info->VolumeLabel, VolNameLength + 1, VolumeName);=0D +=0D + ASSERT_EFI_ERROR (Status);=0D =0D FreePool (VolumeName);=0D =0D diff --git a/Features/Ext4Pkg/Ext4Dxe/Inode.c b/Features/Ext4Pkg/Ext4Dxe/In= ode.c index e44b5638599f..90e3eb88f523 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Inode.c +++ b/Features/Ext4Pkg/Ext4Dxe/Inode.c @@ -230,7 +230,7 @@ Ext4AllocateInode ( =0D Inode =3D AllocateZeroPool (InodeSize);=0D =0D - if (!Inode) {=0D + if (Inode =3D=3D NULL) {=0D return NULL;=0D }=0D =0D --=20 2.39.0