From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by mx.groups.io with SMTP id smtpd.web11.11511.1675333304939843723 for ; Thu, 02 Feb 2023 02:21:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=EMhsaY1R; spf=pass (domain: gmail.com, ip: 209.85.218.53, mailfrom: savvamtr@gmail.com) Received: by mail-ej1-f53.google.com with SMTP id p26so4454849ejx.13 for ; Thu, 02 Feb 2023 02:21:49 -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=YHNZh+VFTe/7OAE855EKgQ+FXhJZmj433ENbJ4phtac=; b=EMhsaY1RPXvnuLnCjgDQRuQMgvWXFLxVBGkj+s3DT5hDiai/2Hq4jsFBO3VEeg7b+/ keIeTiwPZmm2sK618EQui2Eulp8KXn/zEpT8D7CDm+T8OMM6TawetA1mXwlRdi98IGKD mXjB/10+MOr5+HMRTdb8jCJZIXblnRY+FsowZW/Yys3u2Rat6zBkkWTC1fCtOqinaZ+N G2f3tbHZVet/VB5ZbSNwiFYfrooa0l0ixZN6CqQ7vtK2cdmKiXEjsDC0ilgQIwGw4kHC rzyEXxp9Z259T2FAej/6cPOZQpG+nzc+gJde9scA8811/1/+vpG77pDbsO9N91SRkhsf 68Pg== 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=YHNZh+VFTe/7OAE855EKgQ+FXhJZmj433ENbJ4phtac=; b=I/my57+7ez/N1zxKolIba+8acUPDnxRZfrFTjHtIvwYWMWA0cAZtRC8ajJIBtJXFFk 4JQnH4DkOen/DbDsRD/aXYd7/Wounrgjb8dn7o+QrWEjcwe29LBU/DOWEnbWykR0dQwQ 0irK9wj3UtVZSnfEPtlOcr/8DsTHq0Nrxh8J/cjJvv2f3eLPlYNeFB7OHTq1TNMi57Qh Fg69gO4R0QhCQdM4Y7Y7kAJLrTg9HEXU8pLHfbsbc+/WjC6Ezl9Cof0fofiH8fbNB1tF eDm6Eif2c3YZ6cG2GM+XnUB5gy7w9iTSp3xvU4G/aoO/54vvQ4cGRuGcKB3QwN2LoRX+ 7rQg== X-Gm-Message-State: AO0yUKWHVGgyXpiq6sB/NuMj3G/1p6dJMaRJXx+yccffpYjDVoNlfh8s MQjuOLpb4ChpGuVp2z1cTv16iYBHsFQTgQ== X-Google-Smtp-Source: AK7set9VBJGXJWd6IctluIrdpfmOrMqBKzvu840fGY6hZhYoS4CdM6ux77OG/Uyg75CYrslDJbYHzA== X-Received: by 2002:a17:907:7b99:b0:88d:ba89:1846 with SMTP id ne25-20020a1709077b9900b0088dba891846mr1993444ejc.23.1675333308759; Thu, 02 Feb 2023 02:21:48 -0800 (PST) Return-Path: Received: from localhost.localdomain ([176.62.67.29]) by smtp.gmail.com with ESMTPSA id ci22-20020a170906c35600b0087bcda2b07bsm10013121ejb.202.2023.02.02.02.21.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Feb 2023 02:21:48 -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 v4 11/12] Ext4Pkg: Filter out directory entry names containing \0 as invalid Date: Thu, 2 Feb 2023 16:21:32 +0600 Message-Id: <20230202102133.51606-12-savvamtr@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230202102133.51606-1-savvamtr@gmail.com> References: <20230202102133.51606-1-savvamtr@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable The directory entry name conventions forbid having null-terminator symbols in its body and can lead to undefined behavior conditions and crashes Cc: Marvin H=C3=A4user Cc: Pedro Falcato Cc: Vitaly Cheptsov Fixes: 89b2bb0db263 ("Ext4Pkg: Fix and clarify handling regarding non-utf8 = dir entries") Signed-off-by: Savva Mitrofanov Reviewed-by: Pedro Falcato --- Features/Ext4Pkg/Ext4Dxe/Directory.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Features/Ext4Pkg/Ext4Dxe/Directory.c b/Features/Ext4Pkg/Ext4Dx= e/Directory.c index dee8cfc66cb7..88f89a40534c 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Directory.c +++ b/Features/Ext4Pkg/Ext4Dxe/Directory.c @@ -28,9 +28,16 @@ Ext4GetUcs2DirentName ( {=0D CHAR8 Utf8NameBuf[EXT4_NAME_MAX + 1];=0D UINT16 *Str;=0D + UINT8 Index;=0D EFI_STATUS Status;=0D =0D - CopyMem (Utf8NameBuf, Entry->name, Entry->name_len);=0D + for (Index =3D 0; Index < Entry->name_len; ++Index) {=0D + if (Entry->name[Index] =3D=3D '\0') {=0D + return EFI_INVALID_PARAMETER;=0D + }=0D +=0D + Utf8NameBuf[Index] =3D Entry->name[Index];=0D + }=0D =0D Utf8NameBuf[Entry->name_len] =3D '\0';=0D =0D --=20 2.39.1