Skip to contentSkip to conversation

mm-fix-vm_brk_flags-to-not-bail-out-while-holding-lock.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Oct 6, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: fix vm_brk_flags() to not bail out while holding lock
has been removed from the -mm tree. Its filename was
mm-fix-vm_brk_flags-to-not-bail-out-while-holding-lock.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: Sebastian Ott <[email protected]>
Subject: mm: fix vm_brk_flags() to not bail out while holding lock
Date: Fri, 29 Sep 2023 10:19:41 -0700

Calling vm_brk_flags() with flags set other than VM_EXEC will exit the function without releasing the mmap_write_lock.

Just do the sanity check before the lock is acquired. This doesn't fix an actual issue since no caller sets a flag other than VM_EXEC.

Fixes 2e7ce7d354f2 ("mm/mmap: change do_brk_flags() to expand existing VMA and add do_brk_munmap()")
Cc Yu Zhao <[email protected]>

---

 mm/mmap.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
mm/mmap.c renamed from mm/mmap.c~mm-fix-vm_brk_flags-to-not-bail-out-while-holding-lock +3 -3
@@ -3143,13 +3143,13 @@ int vm_brk_flags(unsigned long addr, uns
 	if (!len)
 		return 0;
 
-	if (mmap_write_lock_killable(mm))
-		return -EINTR;
-
 	/* Until we need other flags, refuse anything except VM_EXEC. */
 	if ((flags & (~VM_EXEC)) != 0)
 		return -EINVAL;
 
+	if (mmap_write_lock_killable(mm))
+		return -EINTR;
+
 	ret = check_brk_limits(addr, len);
 	if (ret)
 		goto limits_failed;

_

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