redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

binfmt_flat: use proper user space accessors with old relocs code 

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Reviewed-by: Greg Ungerer <gerg@linux-m68k.org>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
steinar/wifi_calib_4_9_kernel
Nicolas Pitre 2016-07-24 11:30:22 -04:00 committed by Greg Ungerer
parent 6e572ffe3f
commit 1b2ce442ea
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fs/binfmt_flat.c
View File

@ -379,35 +379,38 @@ static void old_reloc(unsigned long rl)
{ {
static const char *segment[] = { "TEXT", "DATA", "BSS", "*UNKNOWN*" }; static const char *segment[] = { "TEXT", "DATA", "BSS", "*UNKNOWN*" };
flat_v2_reloc_t r; flat_v2_reloc_t r;
unsigned long *ptr; unsigned long __user *ptr;
unsigned long val;
r.value = rl; r.value = rl;
#if defined(CONFIG_COLDFIRE) #if defined(CONFIG_COLDFIRE)
ptr = (unsigned long *) (current->mm->start_code + r.reloc.offset); ptr = (unsigned long __user *)(current->mm->start_code + r.reloc.offset);
#else #else
ptr = (unsigned long *) (current->mm->start_data + r.reloc.offset); ptr = (unsigned long __user *)(current->mm->start_data + r.reloc.offset);
#endif #endif
get_user(val, ptr);
pr_debug("Relocation of variable at DATASEG+%x " pr_debug("Relocation of variable at DATASEG+%x "
"(address %p, currently %lx) into segment %s\n", "(address %p, currently %lx) into segment %s\n",
r.reloc.offset, ptr, *ptr, segment[r.reloc.type]); r.reloc.offset, ptr, val, segment[r.reloc.type]);
switch (r.reloc.type) { switch (r.reloc.type) {
case OLD_FLAT_RELOC_TYPE_TEXT: case OLD_FLAT_RELOC_TYPE_TEXT:
*ptr += current->mm->start_code; val += current->mm->start_code;
break; break;
case OLD_FLAT_RELOC_TYPE_DATA: case OLD_FLAT_RELOC_TYPE_DATA:
*ptr += current->mm->start_data; val += current->mm->start_data;
break; break;
case OLD_FLAT_RELOC_TYPE_BSS: case OLD_FLAT_RELOC_TYPE_BSS:
*ptr += current->mm->end_data; val += current->mm->end_data;
break; break;
default: default:
pr_err("Unknown relocation type=%x\n", r.reloc.type); pr_err("Unknown relocation type=%x\n", r.reloc.type);
break; break;
} }
put_user(val, ptr);
pr_debug("Relocation became %lx\n", *ptr); pr_debug("Relocation became %lx\n", val);
} }
/****************************************************************************/ /****************************************************************************/
@ -780,8 +783,13 @@ static int load_flat_file(struct linux_binprm *bprm,
} }
} }
} else { } else {
for (i = 0; i < relocs; i++) for (i = 0; i < relocs; i++) {
old_reloc(ntohl(reloc[i])); unsigned long relval;
if (get_user(relval, reloc + i))
return -EFAULT;
relval = ntohl(relval);
old_reloc(relval);
}
} }
flush_icache_range(start_code, end_code); flush_icache_range(start_code, end_code);