From nobody Sat May 18 23:23:45 2024 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+80874+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+80874+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=ispras.ru ARC-Seal: i=1; a=rsa-sha256; t=1632147253; cv=none; d=zohomail.com; s=zohoarc; b=e8UMeSGAGxvp1TAZPHwd+7Wmf3eHNbufMGy3jTFNa+cng4Xhe5+13stA0pxpoYMq8i5v4E9QtyZFENfhCGU4jBpxYuENt4paRJZTUpbSraKSyp0b/j+Z7lOVjTwjWubspZidH5GqDENU5wUpI9mkGAw3q2H//yRINkx6WzRFGeE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632147253; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=5UZu1sLZ3FRIYP1P3ts2dWBqZiWJguCWQtgTOIR0kdU=; b=e5LZkPQ/QVRsuoHoMzT6zgQIGmodkFpHN9rRQwAOH85DhzdndLtayD39UEv+YkwpuIjsHqnjOreftzfF7N66mtnLN53kAv14TmbUenAS07FIJygn+yuKHMYiLZF6rrByMxY/in/qd2hdCuAfs/2TVVARSz0Aq4gQfOyOdVsT0ko= 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+80874+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 1632147252954706.7732042030138; Mon, 20 Sep 2021 07:14:12 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id NdOgYY1788612xv8FQYxhhaZ; Mon, 20 Sep 2021 07:14:12 -0700 X-Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by mx.groups.io with SMTP id smtpd.web08.12253.1632147250866427540 for ; Mon, 20 Sep 2021 07:14:11 -0700 X-Received: from localhost.localdomain (unknown [77.232.9.83]) by mail.ispras.ru (Postfix) with ESMTPSA id 9934640755D7; Mon, 20 Sep 2021 14:14:06 +0000 (UTC) From: "Vitaly Cheptsov" To: devel@edk2.groups.io Cc: Jiewen Yao , Eric Dong , Michael Kinney , Jian J Wang , Jeff Fan , Mikhail Krichanov , =?UTF-8?q?Marvin=20H=C3=A4user?= Subject: [edk2-devel] [PATCH] UefiCpuPkg: Fix CPU stack guard support by aligning GDT buffer Date: Mon, 20 Sep 2021 17:13:47 +0300 Message-Id: <20210920141347.25161-1-cheptsov@ispras.ru> 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,cheptsov@ispras.ru X-Gm-Message-State: 71RzUsB1LFWKGPKj0IGSG0Ydx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1632147252; bh=jDxFg1C6wixqlEko9Rjyx74drk+LWboEnq8dJKDxS/M=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=T+h6N2JVQnWiqPwDzwyEk7qrpnuzL6tbW5IZSYwMJue8Y25VNTKMZF5LC3lFjOf5qzk v1ANvTPdDvoxGkQgvLI2/ck+rB+SoeOvghusa2qB0T9xyBuciRnbD7c0mFdWsC0Odsrnu lqHo+tB8uo2xtwnMEut86XuyazmthVDi3Ls= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1632147255350100001 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3639 Cc: Jiewen Yao Cc: Eric Dong Cc: Michael Kinney Cc: Jian J Wang Cc: Jeff Fan Cc: Mikhail Krichanov Cc: Marvin H=C3=A4user Signed-off-by: Vitaly Cheptsov --- .../Library/CpuExceptionHandlerLib/DxeException.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c b/Uef= iCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c index fd59f09ecd..12874811e1 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c @@ -22,7 +22,7 @@ EXCEPTION_HANDLER_DATA mExceptionHandlerData; =20 UINT8 mNewStack[CPU_STACK_SWITCH_EXCEPTION_NUMBER * CPU_KNOWN_GOOD_STACK_SIZE]; -UINT8 mNewGdt[CPU_TSS_GDT_SIZE]; +UINT8 mNewGdt[CPU_TSS_GDT_SIZE + IA32_GDT_ALIGNMENT]; =20 /** Common exception handler. @@ -238,6 +238,7 @@ InitializeCpuExceptionHandlersEx ( CPU_EXCEPTION_INIT_DATA EssData; IA32_DESCRIPTOR Idtr; IA32_DESCRIPTOR Gdtr; + UINT8 *Gdt; =20 // // To avoid repeat initialization of default handlers, the caller should= pass @@ -259,6 +260,7 @@ InitializeCpuExceptionHandlersEx ( if (PcdGetBool (PcdCpuStackGuard)) { if (InitData =3D=3D NULL) { SetMem (mNewGdt, sizeof (mNewGdt), 0); + Gdt =3D ALIGN_POINTER (mNewGdt, IA32_GDT_ALIGNMENT); =20 AsmReadIdtr (&Idtr); AsmReadGdtr (&Gdtr); @@ -270,11 +272,11 @@ InitializeCpuExceptionHandlersEx ( EssData.X64.StackSwitchExceptionNumber =3D CPU_STACK_SWITCH_EXCEPT= ION_NUMBER; EssData.X64.IdtTable =3D (VOID *)Idtr.Base; EssData.X64.IdtTableSize =3D Idtr.Limit + 1; - EssData.X64.GdtTable =3D mNewGdt; - EssData.X64.GdtTableSize =3D sizeof (mNewGdt); - EssData.X64.ExceptionTssDesc =3D mNewGdt + Gdtr.Limit + 1; + EssData.X64.GdtTable =3D Gdt; + EssData.X64.GdtTableSize =3D CPU_TSS_GDT_SIZE; + EssData.X64.ExceptionTssDesc =3D Gdt + Gdtr.Limit + 1; EssData.X64.ExceptionTssDescSize =3D CPU_TSS_DESC_SIZE; - EssData.X64.ExceptionTss =3D mNewGdt + Gdtr.Limit + 1 + CPU_TSS_DE= SC_SIZE; + EssData.X64.ExceptionTss =3D Gdt + Gdtr.Limit + 1 + CPU_TSS_DESC_S= IZE; EssData.X64.ExceptionTssSize =3D CPU_TSS_SIZE; =20 InitData =3D &EssData; --=20 2.30.1 (Apple Git-130) -=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 (#80874): https://edk2.groups.io/g/devel/message/80874 Mute This Topic: https://groups.io/mt/85741694/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-