From aaa36bfda9022fc0e1fa9f768c15eec234189a78 Mon Sep 17 00:00:00 2001
From: luyifan <842825214@qq.com>
Date: Tue, 27 Aug 2024 20:55:17 +0800
Subject: [PATCH] Keep MAP_XPM and MAP_EXECUTABLE exclusive

Signed-off-by: luyifan<842825214@qq.com>
---
 mm/mmap.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mm/mmap.c b/mm/mmap.c
index 14e6bfdebbb8..c5127aaf2d7e 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1443,6 +1443,10 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
 	if (flags & MAP_FIXED_NOREPLACE)
 		flags |= MAP_FIXED;
 
+	/* MAP_EXECUTABLE and MAP_XPM is exclusive */
+	if (flags & MAP_EXECUTABLE)
+		flags &= ~MAP_XPM;
+
 	if (!(flags & MAP_FIXED))
 		addr = round_hint_to_min(addr);
 
-- 
Gitee