leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIPS] IRIX: Handle do_brk() error return correctly.

Browse Source 
do_brk's return value was stored in an unsigned long variable before being
tested for less than zero making the test always fail.  Also do_brk's
called irix_map_prda_page wasn't forwarding do_brk() success.

Bug checking the return value of do_brk() and initial fix for it found
by Roel Kluin <12o3l@tiscali.nl>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle 2008-04-16 19:55:26 +01:00
parent 1928cc84a0
commit f4324f3eeb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/mips/kernel/irixelf.c
View File

@ -578,7 +578,7 @@ static inline int map_interpreter(struct elf_phdr *epp, struct elfhdr *ihp,
* process and the system, here we map the page and fill the * process and the system, here we map the page and fill the
* structure * structure
*/ */
static void irix_map_prda_page(void) static int irix_map_prda_page(void)
{ {
unsigned long v; unsigned long v;
struct prda *pp; struct prda *pp;
@ -587,8 +587,8 @@ static void irix_map_prda_page(void)
v = do_brk(PRDA_ADDRESS, PAGE_SIZE); v = do_brk(PRDA_ADDRESS, PAGE_SIZE);
up_write(&current->mm->mmap_sem); up_write(&current->mm->mmap_sem);
if (v < 0) if (v != PRDA_ADDRESS)
return; return v; /* v must be an error code */
pp = (struct prda *) v; pp = (struct prda *) v;
pp->prda_sys.t_pid = task_pid_vnr(current); pp->prda_sys.t_pid = task_pid_vnr(current);
@ -596,6 +596,8 @@ static void irix_map_prda_page(void)
pp->prda_sys.t_rpid = task_pid_vnr(current); pp->prda_sys.t_rpid = task_pid_vnr(current);
/* We leave the rest set to zero */ /* We leave the rest set to zero */
return 0;
} }
@ -781,7 +783,8 @@ static int load_irix_binary(struct linux_binprm * bprm, struct pt_regs * regs)
* IRIX maps a page at 0x200000 which holds some system * IRIX maps a page at 0x200000 which holds some system
* information. Programs depend on this. * information. Programs depend on this.
*/ */
irix_map_prda_page(); if (irix_map_prda_page())
goto out_free_dentry;
padzero(elf_bss); padzero(elf_bss);