Skip to contentSkip to conversation

proc-pid-smaps-add-mseal-info-for-vma.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Jun 25, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: /proc/pid/smaps: add mseal info for vma
has been removed from the -mm tree. Its filename was
proc-pid-smaps-add-mseal-info-for-vma.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Jeff Xu <[email protected]>
Subject: /proc/pid/smaps: add mseal info for vma
Date: Fri, 14 Jun 2024 23:20:14 +0000

Add sl in /proc/pid/smaps to indicate vma is sealed

Fixes 8be7258aad44 ("mseal: add mseal syscall")
Cc Adhemerval Zanella <[email protected]>
Cc Jann Horn <[email protected]>
Cc Jorge Lucangeli Obes <[email protected]>
Cc Kees Cook <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc Stephen Röttger <[email protected]>

---

 Documentation/filesystems/proc.rst |    1 +
 fs/proc/task_mmu.c                 |    3 +++
 include/linux/mm.h                 |    5 +++++
 mm/internal.h                      |    5 -----
 4 files changed, 9 insertions(+), 5 deletions(-)
Documentation/filesystems/proc.rst renamed from Documentation/filesystems/proc.rst~proc-pid-smaps-add-mseal-info-for-vma +1 -0
@@ -571,6 +571,7 @@ encoded manner. The codes are the follow
     um    userfaultfd missing tracking
     uw    userfaultfd wr-protect tracking
     ss    shadow stack page
+    sl    sealed
     ==    =======================================
 
 Note that there is no guarantee that every flag and associated mnemonic will
fs/proc/task_mmu.c renamed from fs/proc/task_mmu.c~proc-pid-smaps-add-mseal-info-for-vma +3 -0
@@ -707,6 +707,9 @@ static void show_smap_vma_flags(struct s
 #ifdef CONFIG_X86_USER_SHADOW_STACK
 		[ilog2(VM_SHADOW_STACK)] = "ss",
 #endif
+#ifdef CONFIG_64BIT
+		[ilog2(VM_SEALED)] = "sl",
+#endif
 	};
 	size_t i;
 
include/linux/mm.h renamed from include/linux/mm.h~proc-pid-smaps-add-mseal-info-for-vma +5 -0
@@ -406,6 +406,11 @@ extern unsigned int kobjsize(const void
 #define VM_ALLOW_ANY_UNCACHED		VM_NONE
 #endif
 
+#ifdef CONFIG_64BIT
+/* VM is sealed, in vm_flags */
+#define VM_SEALED	_BITUL(63)
+#endif
+
 /* Bits set in the VMA until the stack is in its final location */
 #define VM_STACK_INCOMPLETE_SETUP (VM_RAND_READ | VM_SEQ_READ | VM_STACK_EARLY)
 
mm/internal.h renamed from mm/internal.h~proc-pid-smaps-add-mseal-info-for-vma +0 -5
@@ -1435,11 +1435,6 @@ unsigned long shrink_slab(gfp_t gfp_mask
 			  int priority);
 
 #ifdef CONFIG_64BIT
-/* VM is sealed, in vm_flags */
-#define VM_SEALED	_BITUL(63)
-#endif
-
-#ifdef CONFIG_64BIT
 static inline int can_do_mseal(unsigned long flags)
 {
 	if (flags)

_

Patches currently in -mm which might be from [email protected] are