Commit a4eec6a3 authored by David Hildenbrand's avatar David Hildenbrand Committed by Linus Torvalds
Browse files

binfmt: remove in-tree usage of MAP_EXECUTABLE 

Ever since commit e9714acf ("mm: kill vma flag VM_EXECUTABLE and
mm->num_exe_file_vmas"), VM_EXECUTABLE is gone and MAP_EXECUTABLE is
essentially completely ignored.  Let's remove all usage of MAP_EXECUTABLE.

[akpm@linux-foundation.org: fix blooper in fs/binfmt_aout.c. per David]

Link: https://lkml.kernel.org/r/20210421093453.6904-3-david@redhat.com


Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Feng Tang <feng.tang@intel.com>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kevin Brodsky <Kevin.Brodsky@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8fa20752

arch/x86/ia32/ia32_aout.c

+2 −2
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static int load_aout_binary(struct linux_binprm *bprm) 
		error = vm_mmap(bprm->file, N_TXTADDR(ex), ex.a_text,

				PROT_READ | PROT_EXEC,

				MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE |

				MAP_EXECUTABLE | MAP_32BIT,

				MAP_32BIT,

				fd_offset);



		if (error != N_TXTADDR(ex))
@@ -212,7 +212,7 @@ static int load_aout_binary(struct linux_binprm *bprm) 
		error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,

				PROT_READ | PROT_WRITE | PROT_EXEC,

				MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE |

				MAP_EXECUTABLE | MAP_32BIT,

				MAP_32BIT,

				fd_offset + ex.a_text);

		if (error != N_DATADDR(ex))

			return error;

fs/binfmt_aout.c

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static int load_aout_binary(struct linux_binprm * bprm) 


		error = vm_mmap(bprm->file, N_TXTADDR(ex), ex.a_text,

			PROT_READ | PROT_EXEC,

			MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,

			MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE,

			fd_offset);



		if (error != N_TXTADDR(ex))
@@ -230,7 +230,7 @@ static int load_aout_binary(struct linux_binprm * bprm) 


		error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,

				PROT_READ | PROT_WRITE | PROT_EXEC,

				MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,

				MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE,

				fd_offset + ex.a_text);

		if (error != N_DATADDR(ex))

			return error;

fs/binfmt_elf.c

+1 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ static int load_elf_binary(struct linux_binprm *bprm) 
		elf_prot = make_prot(elf_ppnt->p_flags, &arch_state,

				     !!interpreter, false);



		elf_flags = MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE;

		elf_flags = MAP_PRIVATE | MAP_DENYWRITE;



		vaddr = elf_ppnt->p_vaddr;

		/*

fs/binfmt_elf_fdpic.c

+2 −9
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ static int elf_fdpic_map_file_constdisp_on_uclinux( 
{

	struct elf32_fdpic_loadseg *seg;

	struct elf32_phdr *phdr;

	unsigned long load_addr, base = ULONG_MAX, top = 0, maddr = 0, mflags;

	unsigned long load_addr, base = ULONG_MAX, top = 0, maddr = 0;

	int loop, ret;



	load_addr = params->load_addr;
@@ -948,12 +948,8 @@ static int elf_fdpic_map_file_constdisp_on_uclinux( 
	}



	/* allocate one big anon block for everything */

	mflags = MAP_PRIVATE;

	if (params->flags & ELF_FDPIC_FLAG_EXECUTABLE)

		mflags |= MAP_EXECUTABLE;



	maddr = vm_mmap(NULL, load_addr, top - base,

			PROT_READ | PROT_WRITE | PROT_EXEC, mflags, 0);

			PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE, 0);

	if (IS_ERR_VALUE(maddr))

		return (int) maddr;
@@ -1046,9 +1042,6 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params, 
		if (phdr->p_flags & PF_X) prot |= PROT_EXEC;



		flags = MAP_PRIVATE | MAP_DENYWRITE;

		if (params->flags & ELF_FDPIC_FLAG_EXECUTABLE)

			flags |= MAP_EXECUTABLE;



		maddr = 0;



		switch (params->flags & ELF_FDPIC_FLAG_ARRANGEMENT) {

fs/binfmt_flat.c

+1 −1
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ static int load_flat_file(struct linux_binprm *bprm, 
		pr_debug("ROM mapping of file (we hope)\n");



		textpos = vm_mmap(bprm->file, 0, text_len, PROT_READ|PROT_EXEC,

				  MAP_PRIVATE|MAP_EXECUTABLE, 0);

				  MAP_PRIVATE, 0);

		if (!textpos || IS_ERR_VALUE(textpos)) {

			ret = textpos;

			if (!textpos)