From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:37026 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751755AbdJFDiL (ORCPT ); Thu, 5 Oct 2017 23:38:11 -0400 From: Baoquan He To: linux-kernel@vger.kernel.org Cc: viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, oleg@redhat.com, mhocko@kerne.org, keescook@chromium.org, jkosina@suse.cz, mingo@elte.hu, torvalds@linux-foundation.org, Baoquan He Subject: [PATCH 1/3] binfmt_elf: Clean up the variable name of map flags Date: Fri, 6 Oct 2017 11:37:56 +0800 Message-Id: <1507261078-23615-2-git-send-email-bhe@redhat.com> In-Reply-To: <1507261078-23615-1-git-send-email-bhe@redhat.com> References: <1507261078-23615-1-git-send-email-bhe@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: In load_elf_interp() and elf_map(), variables with value of map flags are named as type or elf_type. That may bring confusion since their values not only contain map type which is MAP_SHARED or MAP_PRIVATE, also MAP_FIXED or MAP_DENYWRITE, etc. So change them as flags or elf_flags. Signed-off-by: Baoquan He --- fs/binfmt_elf.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 73b01e474fdc..72b7ecba7ead 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -342,7 +342,7 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec, #ifndef elf_map static unsigned long elf_map(struct file *filep, unsigned long addr, - struct elf_phdr *eppnt, int prot, int type, + struct elf_phdr *eppnt, int prot, int flags, unsigned long total_size) { unsigned long map_addr; @@ -366,11 +366,11 @@ static unsigned long elf_map(struct file *filep, unsigned long addr, */ if (total_size) { total_size = ELF_PAGEALIGN(total_size); - map_addr = vm_mmap(filep, addr, total_size, prot, type, off); + map_addr = vm_mmap(filep, addr, total_size, prot, flags, off); if (!BAD_ADDR(map_addr)) vm_munmap(map_addr+size, total_size-size); } else - map_addr = vm_mmap(filep, addr, size, prot, type, off); + map_addr = vm_mmap(filep, addr, size, prot, flags, off); return(map_addr); } @@ -556,7 +556,7 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex, eppnt = interp_elf_phdata; for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) { if (eppnt->p_type == PT_LOAD) { - int elf_type = MAP_PRIVATE | MAP_DENYWRITE; + int elf_flags = MAP_PRIVATE | MAP_DENYWRITE; int elf_prot = 0; unsigned long vaddr = 0; unsigned long k, map_addr; @@ -569,12 +569,12 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex, elf_prot |= PROT_EXEC; vaddr = eppnt->p_vaddr; if (interp_elf_ex->e_type == ET_EXEC || load_addr_set) - elf_type |= MAP_FIXED; + elf_flags |= MAP_FIXED; else if (no_base && interp_elf_ex->e_type == ET_DYN) load_addr = -vaddr; map_addr = elf_map(interpreter, load_addr + vaddr, - eppnt, elf_prot, elf_type, total_size); + eppnt, elf_prot, elf_flags, total_size); total_size = 0; if (!*interp_map_addr) *interp_map_addr = map_addr; -- 2.5.5