Commit 2632bb84 authored by Kees Cook's avatar Kees Cook
Browse files

mm: Remove unused vm_brk() 



With fs/binfmt_elf.c fully refactored to use the new elf_load() helper,
there are no more users of vm_brk(), so remove it.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org
Suggested-by: default avatarEric Biederman <ebiederm@xmission.com>
Tested-by: default avatarPedro Falcato <pedro.falcato@gmail.com>
Signed-off-by: default avatarSebastian Ott <sebott@redhat.com>
Link: https://lore.kernel.org/r/20230929032435.2391507-6-keescook@chromium.org


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent f9c0a39d

include/linux/mm.h

+1 −2
Original line number Diff line number Diff line
@@ -3308,8 +3308,7 @@ static inline void mm_populate(unsigned long addr, unsigned long len) 
static inline void mm_populate(unsigned long addr, unsigned long len) {}

#endif



/* These take the mm semaphore themselves */

extern int __must_check vm_brk(unsigned long, unsigned long);

/* This takes the mm semaphore itself */

extern int __must_check vm_brk_flags(unsigned long, unsigned long, unsigned long);

extern int vm_munmap(unsigned long, size_t);

extern unsigned long __must_check vm_mmap(struct file *, unsigned long,

mm/mmap.c

+0 −6
Original line number Diff line number Diff line
@@ -3174,12 +3174,6 @@ int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags) 
}

EXPORT_SYMBOL(vm_brk_flags);



int vm_brk(unsigned long addr, unsigned long len)

{

	return vm_brk_flags(addr, len, 0);

}

EXPORT_SYMBOL(vm_brk);



/* Release all mmaps. */

void exit_mmap(struct mm_struct *mm)

{

mm/nommu.c

+0 −5
Original line number Diff line number Diff line
@@ -1531,11 +1531,6 @@ void exit_mmap(struct mm_struct *mm) 
	mmap_write_unlock(mm);

}



int vm_brk(unsigned long addr, unsigned long len)

{

	return -ENOMEM;

}



/*

 * expand (or shrink) an existing mapping, potentially moving it at the same

 * time (controlled by the MREMAP_MAYMOVE flag and available VM space)