Commit f4324f3e authored by Ralf Baechle's avatar Ralf Baechle

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

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: default avatarRalf Baechle <ralf@linux-mips.org>
parent 1928cc84
...@@ -578,7 +578,7 @@ static inline int map_interpreter(struct elf_phdr *epp, struct elfhdr *ihp, ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment