Attachment 27368 Details for Bug 64492

[patch] do brk race fix for SLES8 from 2.4 CVS HEAD

do_brk_unlocked (text/plain), 8.71 KB, created by Andrea Arcangeli on 2005-01-04 08:43:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrea Arcangeli

Created: 2005-01-04 08:43:05 UTC

Size: 8.71 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>
>
>--- x/arch/mips/kernel/irixelf.c.~1~	2003-03-15 03:24:55.000000000 +0100
>+++ x/arch/mips/kernel/irixelf.c	2005-01-04 01:06:05.375387520 +0100
>@@ -130,7 +130,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);
> }
> 
> 
>@@ -379,7 +379,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);
> 
>@@ -567,7 +567,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;
>@@ -859,7 +859,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;
> }
>--- x/arch/sparc64/kernel/binfmt_aout32.c.~1~	2003-03-15 03:24:58.000000000 +0100
>+++ x/arch/sparc64/kernel/binfmt_aout32.c	2005-01-04 01:07:08.166841768 +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;
>--- x/fs/binfmt_aout.c.~1~	2005-01-03 19:24:54.755394784 +0100
>+++ x/fs/binfmt_aout.c	2005-01-04 01:03:16.318088136 +0100
>@@ -46,7 +46,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;
> 	}
>@@ -317,10 +317,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;
>@@ -341,7 +341,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;
>@@ -375,7 +375,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
> 			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);
>@@ -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;
>--- x/fs/binfmt_coff.c.~1~	2005-01-03 19:23:46.793726528 +0100
>+++ x/fs/binfmt_coff.c	2005-01-04 01:04:00.137426584 +0100
>@@ -591,10 +591,10 @@ found:
> 		 * XXX: untested.
> 		 */
> 		loff_t pos = data.scnptr;
>-		status = do_brk(text.vaddr, text.size);
>+		status = do_brk_unlocked(text.vaddr, text.size);
> 		bprm->file->f_op->read(bprm->file,
> 				(char *)data.vaddr, data.scnptr, &pos);
>-		status = do_brk(data.vaddr, data.size);
>+		status = do_brk_unlocked(data.vaddr, data.size);
> 		bprm->file->f_op->read(bprm->file,
> 				(char *)text.vaddr, text.scnptr, &pos);
> 		status = 0;
>--- x/fs/binfmt_elf.c.~1~	2005-01-03 19:24:54.736397672 +0100
>+++ x/fs/binfmt_elf.c	2005-01-04 01:04:20.791286720 +0100
>@@ -85,7 +85,7 @@ static unsigned long set_brk(unsigned lo
> 	end = ELF_PAGEALIGN(end);
> 	if (end <= start)
> 		return 0;
>-	return do_brk(start, end - start);
>+	return do_brk_unlocked(start, end - start);
> }
> 
> 
>@@ -362,7 +362,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;
> 	}
>@@ -403,7 +403,7 @@ static unsigned long load_aout_interp(st
> 		goto out;
> 	}
> 
>-	do_brk(0, text_data);
>+	do_brk_unlocked(0, text_data);
> 	retval = -ENOEXEC;
> 	if (!interpreter->f_op || !interpreter->f_op->read)
> 		goto out;
>@@ -413,7 +413,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;
> 
>@@ -930,7 +930,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) {
>-		error = do_brk(len, bss - len);
>+		error = do_brk_unlocked(len, bss - len);
> 		if (BAD_ADDR(error))
> 			goto out_free_ph;
> 	}
>--- x/include/linux/mm.h.~1~	2005-01-03 19:24:54.147487200 +0100
>+++ x/include/linux/mm.h	2005-01-04 01:29:17.411765824 +0100
>@@ -662,6 +662,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);
> 
> static inline void __vma_unlink(struct mm_struct * mm, struct vm_area_struct * vma, struct vm_area_struct * prev)
> {
>--- x/kernel/ksyms.c.~1~	2005-01-03 19:24:49.000000000 +0100
>+++ x/kernel/ksyms.c	2005-01-04 01:04:33.206399336 +0100
>@@ -110,6 +110,7 @@ EXPORT_SYMBOL(kallsyms_address_to_symbol
> EXPORT_SYMBOL(do_mmap_pgoff);
> EXPORT_SYMBOL(do_munmap);
> EXPORT_SYMBOL(do_brk);
>+EXPORT_SYMBOL(do_brk_unlocked);
> EXPORT_SYMBOL(exit_mm);
> EXPORT_SYMBOL(exit_files);
> EXPORT_SYMBOL(exit_fs);
>--- x/mm/mmap.c.~1~	2005-01-03 19:24:49.000000000 +0100
>+++ x/mm/mmap.c	2005-01-04 01:01:57.676043544 +0100
>@@ -1179,6 +1179,17 @@ out:
> 	return addr;
> }
> 
>+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;
>+}
>+
> /* Build the RB tree corresponding to the VMA list. */
> void build_mmap_rb(struct mm_struct * mm)
> {

Actions: View | Diff

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