summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorIvan Kokshaysky <ink@jurassic.park.msu.ru>2008-04-24 16:54:50 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-05-01 14:44:39 -0700
commit6ba675d46b278f478a22639b1c25b1476afcc351 (patch)
tree43a88e46d9d040217e6f2c42648405c48ebc8b00 /arch
parentd4aa5e3e3e76f3f8c54c7ab1259feabbd4b7da32 (diff)
downloadlinux-stable-6ba675d46b278f478a22639b1c25b1476afcc351.tar.gz
linux-stable-6ba675d46b278f478a22639b1c25b1476afcc351.tar.bz2
linux-stable-6ba675d46b278f478a22639b1c25b1476afcc351.zip
alpha: unbreak OSF/1 (a.out) binaries
commit 2444e56b0c08e6f3e3877583841a1213e3263d98 upstream OSF/1 brk(2) was broken by following one-liner in sys_brk() (commit 4cc6028d4040f95cdb590a87db478b42b8be0508): - if (brk < mm->end_code) + if (brk < mm->start_brk) goto out; The problem is that osf_set_program_attributes() does update mm->end_code, but not mm->start_brk, which still contains inappropriate value left from binary loader, so brk() always fails. Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/kernel/osf_sys.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 8c71daf94a59..9fee37e2596f 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -75,6 +75,7 @@ osf_set_program_attributes(unsigned long text_start, unsigned long text_len,
lock_kernel();
mm = current->mm;
mm->end_code = bss_start + bss_len;
+ mm->start_brk = bss_start + bss_len;
mm->brk = bss_start + bss_len;
#if 0
printk("set_program_attributes(%lx %lx %lx %lx)\n",