From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242])
 by mx.groups.io with SMTP id smtpd.web10.5545.1621575610550863350
 for <devel@edk2.groups.io>;
 Thu, 20 May 2021 22:40:12 -0700
Authentication-Results: mx.groups.io;
 dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn)
Received: from DESKTOPS6D0PVI ([58.246.60.130])
	(envelope-sender <gaoliming@byosoft.com.cn>)
	by 192.168.6.13 with ESMTP
	for <dandan.bi@intel.com>; Fri, 21 May 2021 13:40:04 +0800
X-WM-Sender: gaoliming@byosoft.com.cn
X-Originating-IP: 58.246.60.130
X-WM-AuthFlag: YES
X-WM-AuthUser: gaoliming@byosoft.com.cn
From: "gaoliming" <gaoliming@byosoft.com.cn>
To: <devel@edk2.groups.io>,
	<gaoliming@byosoft.com.cn>,
	"'Walon Li'" <walon.li@hpe.com>
Cc: <nickle.wang@hpe.com>,
	<dandan.bi@intel.com>
References: <20210513024841.2214-1-walon.li@hpe.com> <167E81CF2BD0E45A.10691@groups.io>
In-Reply-To: <167E81CF2BD0E45A.10691@groups.io>
Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0g5Zue5aSNOiBbUEFUQ0hdIE1kZU1vZHVsZVBrZy9QbGF0Zm9ybURyaU92ZXJyaWRlRHhlOiBGaXggb3ZlcmZsb3cgY29uZGl0aW9uIGNoZWNr?=
Date: Fri, 21 May 2021 13:40:07 +0800
Message-ID: <005901d74e03$c1aba900$4502fb00$@byosoft.com.cn>
MIME-Version: 1.0
X-Mailer: Microsoft Outlook 16.0
Thread-Index: AQHwvWYe4XvtPSUJHirY9xkwAFz9wAIJxk3Pqqo+TVA=
Content-Type: text/plain;
	charset="gb2312"
Content-Transfer-Encoding: quoted-printable
Content-Language: zh-cn

Create PR https://github.com/tianocore/edk2/pull/1658.

This patch passed code review before soft feature freeze. So, I merge it f=
or
this stable tag.=20

Thanks
Liming
> -----=D3=CA=BC=FE=D4=AD=BC=FE-----
> =B7=A2=BC=FE=C8=CB: devel@edk2.groups.io <devel@edk2.groups.io> =B4=FA=
=B1=ED gaoliming
> =B7=A2=CB=CD=CA=B1=BC=E4: 2021=C4=EA5=D4=C213=C8=D5 11:14
> =CA=D5=BC=FE=C8=CB: 'Walon Li' <walon.li@hpe.com>; devel@edk2.groups.io
> =B3=AD=CB=CD: nickle.wang@hpe.com; dandan.bi@intel.com
> =D6=F7=CC=E2: [edk2-devel] =BB=D8=B8=B4: [PATCH] MdeModulePkg/PlatformDr=
iOverrideDxe:
> Fix overflow condition check
>=20
> Agree this fix. Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
>=20
> > -----=D3=CA=BC=FE=D4=AD=BC=FE-----
> > =B7=A2=BC=FE=C8=CB: Walon Li <walon.li@hpe.com>
> > =B7=A2=CB=CD=CA=B1=BC=E4: 2021=C4=EA5=D4=C213=C8=D5 10:49
> > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io
> > =B3=AD=CB=CD: walon.li@hpe.com; nickle.wang@hpe.com; dandan.bi@intel.c=
om;
> > gaoliming@byosoft.com.cn
> > =D6=F7=CC=E2: [PATCH] MdeModulePkg/PlatformDriOverrideDxe: Fix overflo=
w
> > condition check
> >
> > Code mistake, VariableIndex is smaller normally than buffer+buffersize
> > so should not break loop.
> >
> > Signed-off-by:Walon Li <walon.li@hpe.com>
> > ---
> >  .../Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c       | 2 +=
-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git
> > a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c
> > b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c
> > index f91f038b7a..bd2d04452f 100644
> > ---
> a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c
> > +++
> > b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideLib.c
> > @@ -776,7 +776,7 @@ InitOverridesMapping (
> >          // Check buffer overflow
> >
> >          //
> >
> >          if ((DriverImageInfo->DriverImagePath =3D=3D NULL) ||
> (VariableIndex
> > < (UINT8 *) DriverDevicePath) ||
> >
> > -            (VariableIndex < (UINT8 *) VariableBuffer + BufferSize)) =
{
> >
> > +            (VariableIndex > (UINT8 *) VariableBuffer + BufferSize)) =
{
> >
> >            Corrupted =3D TRUE;
> >
> >            break;
> >
> >          }
> >
> > --
> > 2.23.0.windows.1
>=20
>=20
>=20
>=20
>=20
>=20
>=20