mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
Some security modules and oprofile still uses VM_EXECUTABLE for retrieving a task's executable file. After this patch they will use mm->exe_file directly. mm->exe_file is protected with mm->mmap_sem, so locking stays the same. Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org> Acked-by: Chris Metcalf <cmetcalf@tilera.com> [arch/tile] Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> [tomoyo] Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Carsten Otte <cotte@de.ibm.com> Cc: Cyrill Gorcunov <gorcunov@openvz.org> Cc: Eric Paris <eparis@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Hugh Dickins <hughd@google.com> Cc: Ingo Molnar <mingo@redhat.com> Acked-by: James Morris <james.l.morris@oracle.com> Cc: Jason Baron <jbaron@redhat.com> Cc: Kentaro Takeda <takedakn@nttdata.co.jp> Cc: Matt Helsley <matthltc@us.ibm.com> Cc: Nick Piggin <npiggin@kernel.dk> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Robert Richter <robert.richter@amd.com> Cc: Suresh Siddha <suresh.b.siddha@intel.com> Cc: Venkatesh Pallipadi <venki@google.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

gecommit door
Linus Torvalds

bovenliggende
0b173bc4da
commit
2dd8ad81e3
@@ -36,19 +36,14 @@ static void sim_notify_exec(const char *binary_name)
|
||||
} while (c);
|
||||
}
|
||||
|
||||
static int notify_exec(void)
|
||||
static int notify_exec(struct mm_struct *mm)
|
||||
{
|
||||
int retval = 0; /* failure */
|
||||
struct vm_area_struct *vma = current->mm->mmap;
|
||||
while (vma) {
|
||||
if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
|
||||
break;
|
||||
vma = vma->vm_next;
|
||||
}
|
||||
if (vma) {
|
||||
|
||||
if (mm->exe_file) {
|
||||
char *buf = (char *) __get_free_page(GFP_KERNEL);
|
||||
if (buf) {
|
||||
char *path = d_path(&vma->vm_file->f_path,
|
||||
char *path = d_path(&mm->exe_file->f_path,
|
||||
buf, PAGE_SIZE);
|
||||
if (!IS_ERR(path)) {
|
||||
sim_notify_exec(path);
|
||||
@@ -106,16 +101,16 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
|
||||
unsigned long vdso_base;
|
||||
int retval = 0;
|
||||
|
||||
down_write(&mm->mmap_sem);
|
||||
|
||||
/*
|
||||
* Notify the simulator that an exec just occurred.
|
||||
* If we can't find the filename of the mapping, just use
|
||||
* whatever was passed as the linux_binprm filename.
|
||||
*/
|
||||
if (!notify_exec())
|
||||
if (!notify_exec(mm))
|
||||
sim_notify_exec(bprm->filename);
|
||||
|
||||
down_write(&mm->mmap_sem);
|
||||
|
||||
/*
|
||||
* MAYWRITE to allow gdb to COW and set breakpoints
|
||||
*/
|
||||
|
Verwijs in nieuw issue
Block a user