Skip to content

Commit e0f81ab

Browse files
Sebastian Ottakpm00
authored andcommitted
mm: fix vm_brk_flags() to not bail out while holding lock
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. Link: https://lkml.kernel.org/r/[email protected] Fixes: 2e7ce7d ("mm/mmap: change do_brk_flags() to expand existing VMA and add do_brk_munmap()") Signed-off-by: Sebastian Ott <[email protected]> Signed-off-by: Kees Cook <[email protected]> Reviewed-by: Liam R. Howlett <[email protected]> Cc: Yu Zhao <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 51f6253 commit e0f81ab

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

mm/mmap.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3143,13 +3143,13 @@ int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags)
31433143
if (!len)
31443144
return 0;
31453145

3146-
if (mmap_write_lock_killable(mm))
3147-
return -EINTR;
3148-
31493146
/* Until we need other flags, refuse anything except VM_EXEC. */
31503147
if ((flags & (~VM_EXEC)) != 0)
31513148
return -EINVAL;
31523149

3150+
if (mmap_write_lock_killable(mm))
3151+
return -EINTR;
3152+
31533153
ret = check_brk_limits(addr, len);
31543154
if (ret)
31553155
goto limits_failed;

0 commit comments

Comments
 (0)