Attachment 27372 Details for Bug 64492

[patch] do brk race fix for 2.6 CVS SLES9 SP1 branch and CVS SLES9 GA branch

do_brk_unlocked-2.6.5 (text/plain), 9.59 KB, created by Andrea Arcangeli on 2005-01-04 09:22:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrea Arcangeli

Created: 2005-01-04 09:22:19 UTC

Size: 9.59 KB

patch

obsolete

>From: Andrea Arcangeli <andrea@suse.de>
>Subject: based on Marcelo's patch and Andrew's suggestion
> add missing mmap_sem around do_brk calls
>Patch-mainline: no
>References: 49492
>
>Signed-off-by: Andrea Arcangeli <andrea@suse.de>
>
>--- xx/arch/mips/kernel/irixelf.c.orig	2005-01-04 01:57:41.878647472 +0100
>+++ xx/arch/mips/kernel/irixelf.c	2005-01-04 02:00:50.064038944 +0100
>@@ -128,7 +128,7 @@ static void set_brk(unsigned long start,
> 	end = PAGE_ALIGN(end);
> 	if (end <= start)
> 		return;
>-	do_brk(start, end - start);
>+	do_brk_unlocked(start, end - start);
> }
> 
> 
>@@ -377,7 +377,7 @@ static unsigned int load_irix_interp(str
> 
> 	/* Map the last of the bss segment */
> 	if (last_bss > len) {
>-		do_brk(len, (last_bss - len));
>+		do_brk_unlocked(len, (last_bss - len));
> 	}
> 	kfree(elf_phdata);
> 
>@@ -565,7 +565,7 @@ void irix_map_prda_page (void)
> 	unsigned long v;
> 	struct prda *pp;
> 
>-	v =  do_brk (PRDA_ADDRESS, PAGE_SIZE);
>+	v =  do_brk_unlocked (PRDA_ADDRESS, PAGE_SIZE);
> 
> 	if (v < 0)
> 		return;
>@@ -857,7 +857,7 @@ static int load_irix_library(struct file
> 	len = (elf_phdata->p_filesz + elf_phdata->p_vaddr+ 0xfff) & 0xfffff000;
> 	bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
> 	if (bss > len)
>-	  do_brk(len, bss-len);
>+	  do_brk_unlocked(len, bss-len);
> 	kfree(elf_phdata);
> 	return 0;
> }
>--- xx/arch/sparc64/kernel/binfmt_aout32.c.orig	2005-01-04 01:57:41.880647168 +0100
>+++ xx/arch/sparc64/kernel/binfmt_aout32.c	2005-01-04 02:01:36.984905888 +0100
>@@ -49,7 +49,7 @@ static void set_brk(unsigned long start,
> 	end = PAGE_ALIGN(end);
> 	if (end <= start)
> 		return;
>-	do_brk(start, end - start);
>+	do_brk_unlocked(start, end - start);
> }
> 
> /*
>@@ -246,10 +246,10 @@ static int load_aout32_binary(struct lin
> 	if (N_MAGIC(ex) == NMAGIC) {
> 		loff_t pos = fd_offset;
> 		/* Fuck me plenty... */
>-		error = do_brk(N_TXTADDR(ex), ex.a_text);
>+		error = do_brk_unlocked(N_TXTADDR(ex), ex.a_text);
> 		bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
> 			  ex.a_text, &pos);
>-		error = do_brk(N_DATADDR(ex), ex.a_data);
>+		error = do_brk_unlocked(N_DATADDR(ex), ex.a_data);
> 		bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex),
> 			  ex.a_data, &pos);
> 		goto beyond_if;
>@@ -257,7 +257,7 @@ static int load_aout32_binary(struct lin
> 
> 	if (N_MAGIC(ex) == OMAGIC) {
> 		loff_t pos = fd_offset;
>-		do_brk(N_TXTADDR(ex) & PAGE_MASK,
>+		do_brk_unlocked(N_TXTADDR(ex) & PAGE_MASK,
> 			ex.a_text+ex.a_data + PAGE_SIZE - 1);
> 		bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
> 			  ex.a_text+ex.a_data, &pos);
>@@ -272,7 +272,7 @@ static int load_aout32_binary(struct lin
> 
> 		if (!bprm->file->f_op->mmap) {
> 			loff_t pos = fd_offset;
>-			do_brk(0, ex.a_text+ex.a_data);
>+			do_brk_unlocked(0, ex.a_text+ex.a_data);
> 			bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
> 				  ex.a_text+ex.a_data, &pos);
> 			goto beyond_if;
>@@ -388,7 +388,7 @@ static int load_aout32_library(struct fi
> 	len = PAGE_ALIGN(ex.a_text + ex.a_data);
> 	bss = ex.a_text + ex.a_data + ex.a_bss;
> 	if (bss > len) {
>-		error = do_brk(start_addr + len, bss - len);
>+		error = do_brk_unlocked(start_addr + len, bss - len);
> 		retval = error;
> 		if (error != start_addr + len)
> 			goto out;
>--- xx/arch/x86_64/ia32/ia32_aout.c.orig	2005-01-04 01:59:26.001818344 +0100
>+++ xx/arch/x86_64/ia32/ia32_aout.c	2005-01-04 02:00:50.323999424 +0100
>@@ -114,7 +114,7 @@ static int set_brk(unsigned long start, 
> 	start = PAGE_ALIGN(start);
> 	end = PAGE_ALIGN(end);
> 	if (end > start) {
>-		unsigned long addr = do_brk(start, end - start);
>+		unsigned long addr = do_brk_unlocked(start, end - start);
> 		if (BAD_ADDR(addr))
> 			return addr;
> 	}
>@@ -327,7 +327,7 @@ static int load_aout_binary(struct linux
> 		pos = 32;
> 		map_size = ex.a_text+ex.a_data;
> 
>-		error = do_brk(text_addr & PAGE_MASK, map_size);
>+		error = do_brk_unlocked(text_addr & PAGE_MASK, map_size);
> 		if (error != (text_addr & PAGE_MASK)) {
> 			send_sig(SIGKILL, current, 0);
> 			return error;
>@@ -363,7 +363,7 @@ static int load_aout_binary(struct linux
> 
> 		if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) {
> 			loff_t pos = fd_offset;
>-			do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data);
>+			do_brk_unlocked(N_TXTADDR(ex), ex.a_text+ex.a_data);
> 			bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
> 					ex.a_text+ex.a_data, &pos);
> 			flush_icache_range((unsigned long) N_TXTADDR(ex),
>@@ -476,7 +476,7 @@ static int load_aout_library(struct file
> 		}
> #endif
> 
>-		do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
>+		do_brk_unlocked(start_addr, ex.a_text + ex.a_data + ex.a_bss);
> 		
> 		file->f_op->read(file, (char *)start_addr,
> 			ex.a_text + ex.a_data, &pos);
>@@ -500,7 +500,7 @@ static int load_aout_library(struct file
> 	len = PAGE_ALIGN(ex.a_text + ex.a_data);
> 	bss = ex.a_text + ex.a_data + ex.a_bss;
> 	if (bss > len) {
>-		error = do_brk(start_addr + len, bss - len);
>+		error = do_brk_unlocked(start_addr + len, bss - len);
> 		retval = error;
> 		if (error != start_addr + len)
> 			goto out;
>--- xx/fs/binfmt_aout.c.orig	2005-01-04 01:59:26.002818192 +0100
>+++ xx/fs/binfmt_aout.c	2005-01-04 02:02:09.852909192 +0100
>@@ -51,7 +51,7 @@ static int set_brk(unsigned long start, 
> 	start = PAGE_ALIGN(start);
> 	end = PAGE_ALIGN(end);
> 	if (end > start) {
>-		unsigned long addr = do_brk(start, end - start);
>+		unsigned long addr = do_brk_unlocked(start, end - start);
> 		if (BAD_ADDR(addr))
> 			return addr;
> 	}
>@@ -323,10 +323,10 @@ static int load_aout_binary(struct linux
> 		loff_t pos = fd_offset;
> 		/* Fuck me plenty... */
> 		/* <AOL></AOL> */
>-		error = do_brk(N_TXTADDR(ex), ex.a_text);
>+		error = do_brk_unlocked(N_TXTADDR(ex), ex.a_text);
> 		bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
> 			  ex.a_text, &pos);
>-		error = do_brk(N_DATADDR(ex), ex.a_data);
>+		error = do_brk_unlocked(N_DATADDR(ex), ex.a_data);
> 		bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex),
> 			  ex.a_data, &pos);
> 		goto beyond_if;
>@@ -347,7 +347,7 @@ static int load_aout_binary(struct linux
> 		map_size = ex.a_text+ex.a_data;
> #endif
> 
>-		error = do_brk(text_addr & PAGE_MASK, map_size);
>+		error = do_brk_unlocked(text_addr & PAGE_MASK, map_size);
> 		if (error != (text_addr & PAGE_MASK)) {
> 			send_sig(SIGKILL, current, 0);
> 			return error;
>@@ -381,7 +381,7 @@ static int load_aout_binary(struct linux
> 
> 		if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) {
> 			loff_t pos = fd_offset;
>-			do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data);
>+			do_brk_unlocked(N_TXTADDR(ex), ex.a_text+ex.a_data);
> 			bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
> 					ex.a_text+ex.a_data, &pos);
> 			flush_icache_range((unsigned long) N_TXTADDR(ex),
>@@ -486,7 +486,7 @@ static int load_aout_library(struct file
> 			error_time = jiffies;
> 		}
> 
>-		do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
>+		do_brk_unlocked(start_addr, ex.a_text + ex.a_data + ex.a_bss);
> 		
> 		file->f_op->read(file, (char *)start_addr,
> 			ex.a_text + ex.a_data, &pos);
>@@ -510,7 +510,7 @@ static int load_aout_library(struct file
> 	len = PAGE_ALIGN(ex.a_text + ex.a_data);
> 	bss = ex.a_text + ex.a_data + ex.a_bss;
> 	if (bss > len) {
>-		error = do_brk(start_addr + len, bss - len);
>+		error = do_brk_unlocked(start_addr + len, bss - len);
> 		retval = error;
> 		if (error != start_addr + len)
> 			goto out;
>--- xx/fs/binfmt_elf.c.orig	2005-01-04 01:59:25.796849504 +0100
>+++ xx/fs/binfmt_elf.c	2005-01-04 02:00:50.415985440 +0100
>@@ -88,7 +88,7 @@ static int set_brk(unsigned long start, 
> 	start = ELF_PAGEALIGN(start);
> 	end = ELF_PAGEALIGN(end);
> 	if (end > start) {
>-		unsigned long addr = do_brk(start, end - start);
>+		unsigned long addr = do_brk_unlocked(start, end - start);
> 		if (BAD_ADDR(addr))
> 			return addr;
> 	}
>@@ -406,7 +406,7 @@ static unsigned long load_elf_interp(str
> 
> 	/* Map the last of the bss segment */
> 	if (last_bss > elf_bss) {
>-		error = do_brk(elf_bss, last_bss - elf_bss);
>+		error = do_brk_unlocked(elf_bss, last_bss - elf_bss);
> 		if (BAD_ADDR(error))
> 			goto out_close;
> 	}
>@@ -446,7 +446,7 @@ static unsigned long load_aout_interp(st
> 		goto out;
> 	}
> 
>-	do_brk(0, text_data);
>+	do_brk_unlocked(0, text_data);
> 	if (!interpreter->f_op || !interpreter->f_op->read)
> 		goto out;
> 	if (interpreter->f_op->read(interpreter, addr, text_data, &offset) < 0)
>@@ -454,7 +454,7 @@ static unsigned long load_aout_interp(st
> 	flush_icache_range((unsigned long)addr,
> 	                   (unsigned long)addr + text_data);
> 
>-	do_brk(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),
>+	do_brk_unlocked(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),
> 		interp_ex->a_bss);
> 	elf_entry = interp_ex->a_entry;
> 
>@@ -1006,7 +1006,7 @@ static int load_elf_library(struct file 
> 	len = ELF_PAGESTART(elf_phdata->p_filesz + elf_phdata->p_vaddr + ELF_MIN_ALIGN - 1);
> 	bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
> 	if (bss > len)
>-		do_brk(len, bss - len);
>+		do_brk_unlocked(len, bss - len);
> 	error = 0;
> 
> out_free_ph:
>--- xx/include/linux/mm.h.orig	2005-01-04 01:59:35.269409456 +0100
>+++ xx/include/linux/mm.h	2005-01-04 02:00:50.440981640 +0100
>@@ -821,6 +821,7 @@ out:
> extern int do_munmap(struct mm_struct *, unsigned long, size_t);
> 
> extern unsigned long do_brk(unsigned long, unsigned long);
>+extern unsigned long do_brk_unlocked(unsigned long, unsigned long);
> 
> /* vma merging helpers */
> static inline void
>--- xx/mm/mmap.c.orig	2005-01-04 01:59:35.271409152 +0100
>+++ xx/mm/mmap.c	2005-01-04 02:00:50.457979056 +0100
>@@ -1658,6 +1658,19 @@ out:
> 
> EXPORT_SYMBOL(do_brk);
> 
>+unsigned long do_brk_unlocked(unsigned long addr, unsigned long len)
>+{
>+	unsigned long ret;
>+
>+	down_write(&current->mm->mmap_sem);
>+	ret = do_brk(addr, len);
>+	up_write(&current->mm->mmap_sem);
>+
>+	return ret;
>+}
>+
>+EXPORT_SYMBOL(do_brk_unlocked);
>+
> /* Release all mmaps. */
> void exit_mmap(struct mm_struct *mm)
> {

Actions: View | Diff

Attachments on bug 64492: 27352 | 27353 | 27368 | 27369 | 27370 | 27371 | 27372 | 27375 | 27376 | 27380 | 27510 | 27534 | 33137