Attachment 27381 Details for Bug 64493

[patch] binfmt_aout_do_brk_fix_24.patch

binfmt_aout_do_brk_fix_24.patch (text/plain), 1.56 KB, created by Marcus Meissner on 2005-01-04 21:30:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2005-01-04 21:30:52 UTC

Size: 1.56 KB

patch

obsolete

># This is a BitKeeper generated diff -Nru style patch.
>#
># ChangeSet
>#   2004/12/16 16:06:31-02:00 chrisw@osdl.org 
>#   [PATCH] a.out: error check on set_brk
>#   
>#   It's possible for do_brk() to fail during set_brk() when exec'ing and
>#   a.out.  This was noted with Florian's a.out binary and overcommit set to
>#   0.
>#   
>#   Capture this error and terminate properly.
>#   
>#   Signed-off-by: Chris Wright <chrisw@osdl.org>
>#   Signed-off-by: Linus Torvalds <torvalds@osdl.org>
># 
># fs/binfmt_aout.c
>#   2004/12/16 14:56:48-02:00 chrisw@osdl.org +14 -5
>#   a.out: error check on set_brk
># 
>diff -Nru a/fs/binfmt_aout.c b/fs/binfmt_aout.c
>--- a/fs/binfmt_aout.c	2005-01-04 05:30:14 -08:00
>+++ b/fs/binfmt_aout.c	2005-01-04 05:30:14 -08:00
>@@ -39,13 +39,18 @@
> 	NULL, THIS_MODULE, load_aout_binary, load_aout_library, aout_core_dump, PAGE_SIZE
> };
> 
>-static void set_brk(unsigned long start, unsigned long end)
>+#define BAD_ADDR(x)	((unsigned long)(x) >= TASK_SIZE)
>+
>+static int set_brk(unsigned long start, unsigned long end)
> {
> 	start = PAGE_ALIGN(start);
> 	end = PAGE_ALIGN(end);
>-	if (end <= start)
>-		return;
>-	do_brk(start, end - start);
>+	if (end > start) {
>+		unsigned long addr = do_brk(start, end - start);
>+		if (BAD_ADDR(addr))
>+			return addr;
>+	}
>+	return 0;
> }
> 
> /*
>@@ -405,7 +410,11 @@
> beyond_if:
> 	set_binfmt(&aout_format);
> 
>-	set_brk(current->mm->start_brk, current->mm->brk);
>+	retval = set_brk(current->mm->start_brk, current->mm->brk);
>+	if (retval < 0) {
>+		send_sig(SIGKILL, current, 0);
>+		return retval;
>+	}
> 
> 	retval = setup_arg_pages(bprm); 
> 	if (retval < 0) {

Actions: View | Diff

Attachments on bug 64493: 27381 | 27382