Skip to content

Commit

Permalink
mm: fix vm_brk_flags() to not bail out while holding lock
Browse files Browse the repository at this point in the history
commit e0f81ab upstream.

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/20230929171937.work.697-kees@kernel.org
Fixes: 2e7ce7d ("mm/mmap: change do_brk_flags() to expand existing VMA and add do_brk_munmap()")
Signed-off-by: Sebastian Ott <sebott@redhat.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Yu Zhao <yuzhao@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Sebastian Ott authored and gregkh committed Nov 2, 2023
1 parent 5ee66af commit e3f64e0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions mm/mmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -3136,13 +3136,13 @@ int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags)
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;
Expand Down

0 comments on commit e3f64e0

Please sign in to comment.