File 0025-fixup-nx-set-attrs-in-our-kernel-loaders.patch of Package grub2

From abf59e6efec0ad17c77f857b982d2206ae0224a4 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 13 Jul 2023 21:54:12 +0800
Subject: [PATCH 25/28] fixup! nx: set attrs in our kernel loaders

---
 grub-core/kern/efi/mm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
index d36802899..b00defaca 100644
--- a/grub-core/kern/efi/mm.c
+++ b/grub-core/kern/efi/mm.c
@@ -633,8 +633,8 @@ grub_nx_init (void)
     grub_dprintf ("nx", "page attrs for grub_nx_init (%p) are %c%c%c\n",
 		  grub_dl_load_core,
 		  (attrs & GRUB_MEM_ATTR_R) ? 'r' : '-',
-		  (attrs & GRUB_MEM_ATTR_R) ? 'w' : '-',
-		  (attrs & GRUB_MEM_ATTR_R) ? 'x' : '-');
+		  (attrs & GRUB_MEM_ATTR_W) ? 'w' : '-',
+		  (attrs & GRUB_MEM_ATTR_X) ? 'x' : '-');
 
   stack_current = (grub_addr_t)&stack_current & page_mask;
   err = grub_get_mem_attrs (stack_current, page_size, &stack_attrs);
@@ -651,8 +651,8 @@ grub_nx_init (void)
       grub_dprintf ("nx", "page attrs for stack (%p) are %c%c%c\n",
                     &attrs,
                     (attrs & GRUB_MEM_ATTR_R) ? 'r' : '-',
-                    (attrs & GRUB_MEM_ATTR_R) ? 'w' : '-',
-                    (attrs & GRUB_MEM_ATTR_R) ? 'x' : '-');
+                    (attrs & GRUB_MEM_ATTR_W) ? 'w' : '-',
+                    (attrs & GRUB_MEM_ATTR_X) ? 'x' : '-');
     }
   for (stack_end = stack_current + page_size ;
        !(attrs & GRUB_MEM_ATTR_R);
-- 
2.42.0

openSUSE Build Service is sponsored by