Skip to content

Commit 3fe5a59

Browse files
committed
memfd: move MFD_ALL_FLAGS definition to memfd.h
It's not part of the UAPI, but putting it here is better from a maintainability POV. Cc: Baolin Wang <baolin.wang@linux.alibaba.com> Cc: Hugh Dickins <hughd@google.com> Cc: Joey Pabalinas <joeypabalinas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 5f15436 commit 3fe5a59

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

include/uapi/linux/memfd.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#define MFD_NOEXEC_SEAL 0x0008U
1313
/* executable */
1414
#define MFD_EXEC 0x0010U
15+
#define MFD_ALL_FLAGS (MFD_CLOEXEC | MFD_ALLOW_SEALING | \
16+
MFD_HUGETLB | MFD_NOEXEC_SEAL | MFD_EXEC)
1517

1618
/*
1719
* Huge page size encoding when MFD_HUGETLB is specified, and a huge page

mm/memfd.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,6 @@ long memfd_fcntl(struct file *file, unsigned int cmd, unsigned int arg)
313313
#define MFD_NAME_PREFIX_LEN (sizeof(MFD_NAME_PREFIX) - 1)
314314
#define MFD_NAME_MAX_LEN (NAME_MAX - MFD_NAME_PREFIX_LEN)
315315

316-
#define MFD_ALL_FLAGS (MFD_CLOEXEC | MFD_ALLOW_SEALING | MFD_HUGETLB | MFD_NOEXEC_SEAL | MFD_EXEC)
317-
318316
static int check_sysctl_memfd_noexec(unsigned int *flags)
319317
{
320318
#ifdef CONFIG_SYSCTL

0 commit comments

Comments
 (0)