Commit b487c024 authored Dec 06, 2024 by Jeff Xu Committed by Andrew Morton Jan 13, 2025

mseal: remove can_do_mseal()

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().

Link: https://lkml.kernel.org/r/20241206013934.2782793-1-jeffxu@google.com
Link: https://lkml.kernel.org/r/20241206194839.3030596-2-jeffxu@google.com


Signed-off-by: Jeff Xu <jeffxu@chromium.org>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Jorge Lucangeli Obes <jorgelo@chromium.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Pedro Falcato <pedro.falcato@gmail.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

parent 052ccfbc

mm/internal.h

+0 −16

Original line number	Diff line number	Diff line
		@@ -1451,22 +1451,6 @@ void __meminit __init_single_page(struct page *page, unsigned long pfn,
		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

+3 −3

Original line number	Diff line number	Diff line
		@@ -217,9 +217,9 @@ int do_mseal(unsigned long start, size_t len_in, unsigned long flags)
		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))