34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
|
From c7b305152802c8db688605654f75e1195def9fd6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nicholas Bishop <nicholasbishop@google.com>
|
||
|
|
Date: Mon, 19 Dec 2022 18:56:13 -0500
|
||
|
|
Subject: [PATCH] pe: Align section size up to page size for mem attrs
|
||
|
|
|
||
|
|
Setting memory attributes is generally done at page granularity, and
|
||
|
|
this is enforced by checks in `get_mem_attrs` and
|
||
|
|
`update_mem_attrs`. But unlike the section address, the section size
|
||
|
|
isn't necessarily aligned to 4KiB. Round up the section size to fix
|
||
|
|
this.
|
||
|
|
|
||
|
|
Signed-off-by: Nicholas Bishop <nicholasbishop@google.com>
|
||
|
|
---
|
||
|
|
pe.c | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/pe.c b/pe.c
|
||
|
|
index 9a3679e16..5ad0914ba 100644
|
||
|
|
--- a/pe.c
|
||
|
|
+++ b/pe.c
|
||
|
|
@@ -1372,7 +1372,11 @@ handle_image (void *data, unsigned int datasize,
|
||
|
|
+ Section->Misc.VirtualSize - 1);
|
||
|
|
|
||
|
|
addr = (uintptr_t)base;
|
||
|
|
- length = (uintptr_t)end - (uintptr_t)base + 1;
|
||
|
|
+ // Align the length up to PAGE_SIZE. This is required because
|
||
|
|
+ // platforms generally set memory attributes at page
|
||
|
|
+ // granularity, but the section length (unlike the section
|
||
|
|
+ // address) is not required to be aligned.
|
||
|
|
+ length = ALIGN_VALUE((uintptr_t)end - (uintptr_t)base + 1, PAGE_SIZE);
|
||
|
|
|
||
|
|
if (Section->Characteristics & EFI_IMAGE_SCN_MEM_WRITE) {
|
||
|
|
set_attrs |= MEM_ATTR_W;
|