From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.66]) by mx.groups.io with SMTP id smtpd.web09.20692.1628502716021365054 for ; Mon, 09 Aug 2021 02:51:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@posteo.de header.s=2017 header.b=IPyZE6+r; spf=pass (domain: posteo.de, ip: 185.67.36.66, mailfrom: mhaeuser@posteo.de) Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 3EEF4240106 for ; Mon, 9 Aug 2021 11:51:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1628502714; bh=C7BIcS6JCVpO5FY+7W9mD8k1UW8Gh2BQu9RQN79OTNQ=; h=From:To:Cc:Subject:Date:From; b=IPyZE6+ra36pHNaFQofNKbrgdcCdH5GFaPB1kAmdfnXim5XOF/tNdMy4LtjQdECeL GDVEa/06RPk5dSZNBkYqWdshjQe543DxY+eFwVCeY+z46SNvufuaMnd7HmZQmsxcxE OcBQ0SzSzqh9gUbncfvMFQ6DcTjke0VeY/2GWPGarJ8DhSChnU5MqA2GGC4HuvU07X hxltZ1h+UnAmdo1WeBaijFR40scnxunpMQtIHI6fdTsql1ajLPz+ErltQHRtrQLRMt W80yhivSFAaewHtmSG7MV/aT0fmnC76ngUpzYjq73eJ3hA1bRfvEwSmSJ4tfCO5b4x z1BmkT2483miQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Gjrvs5g44z6tmG; Mon, 9 Aug 2021 11:51:53 +0200 (CEST) From: =?UTF-8?B?TWFydmluIEjDpHVzZXI=?= To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Abner Chang , Daniel Schaefer , Vitaly Cheptsov Subject: [PATCH v2 6/7] EmbeddedPkg/GdbStub: Mandatory LoadedImage for DebugImageInfoTable Date: Mon, 9 Aug 2021 09:51:31 +0000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable To make parsing DebugImageInfoTable easier and safer, require the LoadedImage protocol instance to be valid for every NormalImage entry. Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Abner Chang Cc: Daniel Schaefer Cc: Vitaly Cheptsov Signed-off-by: Marvin H=C3=A4user --- EmbeddedPkg/GdbStub/GdbStub.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/EmbeddedPkg/GdbStub/GdbStub.c b/EmbeddedPkg/GdbStub/GdbStub.c index 09167fdafb4d..29aa63237304 100644 --- a/EmbeddedPkg/GdbStub/GdbStub.c +++ b/EmbeddedPkg/GdbStub/GdbStub.c @@ -1044,8 +1044,9 @@ QxferLibrary ( if (gDebugTable !=3D NULL) {=0D for (; gEfiDebugImageTableEntry < gDebugImageTableHeader->TableSize; g= EfiDebugImageTableEntry++, gDebugTable++) {=0D if (gDebugTable->ImageInfoType !=3D NULL) {=0D - if ((*gDebugTable->ImageInfoType =3D=3D EFI_DEBUG_IMAGE_INFO_TYPE_= NORMAL) &&=0D - (gDebugTable->NormalImage->LoadedImageProtocolInstance !=3D NU= LL)) {=0D + if (*gDebugTable->ImageInfoType =3D=3D EFI_DEBUG_IMAGE_INFO_TYPE_N= ORMAL) {=0D + ASSERT (gDebugTable->NormalImage->LoadedImageProtocolInstance != =3D NULL);=0D +=0D Pdb =3D PeCoffLoaderGetDebuggerInfo (=0D gDebugTable->NormalImage->LoadedImageProtocolInstance->Im= ageBase,=0D &LoadAddress=0D --=20 2.31.1