Skip to contentSkip to conversation

mseal-remove-can_do_mseal.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 14, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mseal: remove can_do_mseal()
has been removed from the -mm tree. Its filename was
mseal-remove-can_do_mseal.patch

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

------------------------------------------------------
From: Jeff Xu <[email protected]>
Subject: mseal: remove can_do_mseal()
Date: Fri, 6 Dec 2024 19:48:39 +0000

No code logic change.

can_do_mseal() is called exclusively by mseal.c, and mseal.c is compiled only when CONFIG_64BIT flag is set in makefile. Therefore, it is unnecessary to have 32 bit stub function in the header file, remove this function and merge the logic into do_mseal().

---

 mm/internal.h |   16 ----------------
 mm/mseal.c    |    6 +++---
 2 files changed, 3 insertions(+), 19 deletions(-)
mm/internal.h renamed from mm/internal.h~mseal-remove-can_do_mseal +0 -16
@@ -1451,22 +1451,6 @@ void __meminit __init_single_page(struct
 unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup *memcg,
 			  int priority);
 
-#ifdef CONFIG_64BIT
-static inline int can_do_mseal(unsigned long flags)
-{
-	if (flags)
-		return -EINVAL;
-
-	return 0;
-}
-
-#else
-static inline int can_do_mseal(unsigned long flags)
-{
-	return -EPERM;
-}
-#endif
-
 #ifdef CONFIG_SHRINKER_DEBUG
 static inline __printf(2, 0) int shrinker_debugfs_name_alloc(
 			struct shrinker *shrinker, const char *fmt, va_list ap)
mm/mseal.c renamed from mm/mseal.c~mseal-remove-can_do_mseal +3 -3
@@ -217,9 +217,9 @@ int do_mseal(unsigned long start, size_t
 	unsigned long end;
 	struct mm_struct *mm = current->mm;
 
-	ret = can_do_mseal(flags);
-	if (ret)
-		return ret;
+	/* Verify flags not set. */
+	if (flags)
+		return -EINVAL;
 
 	start = untagged_addr(start);
 	if (!PAGE_ALIGNED(start))

_

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