Attachment 27375 Details for Bug 64492

[patch] 2.4.28-diff-brk.patch from Marcello

2.4.28-diff-brk.patch (text/plain), 7.71 KB, created by Ludwig Nussel on 2005-01-04 17:29:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ludwig Nussel

Created: 2005-01-04 17:29:11 UTC

Size: 7.71 KB

patch

obsolete

>diff -Nur linux-2.4.28.orig/arch/mips/kernel/irixelf.c linux-2.4.28/arch/mips/kernel/irixelf.c
>--- linux-2.4.28.orig/arch/mips/kernel/irixelf.c	2005-01-03 20:07:13.325584848 -0200
>+++ linux-2.4.28/arch/mips/kernel/irixelf.c	2005-01-03 20:17:00.192367536 -0200
>@@ -130,7 +130,7 @@
> 	end = PAGE_ALIGN(end);
> 	if (end <= start)
> 		return;
>-	do_brk(start, end - start);
>+	do_brk_locked(start, end - start);
> }
> 
> 
>@@ -379,7 +379,7 @@
> 
> 	/* Map the last of the bss segment */
> 	if (last_bss > len) {
>-		do_brk(len, (last_bss - len));
>+		do_brk_locked(len, (last_bss - len));
> 	}
> 	kfree(elf_phdata);
> 
>@@ -567,7 +567,7 @@
> 	unsigned long v;
> 	struct prda *pp;
> 
>-	v =  do_brk (PRDA_ADDRESS, PAGE_SIZE);
>+	v =  do_brk_locked (PRDA_ADDRESS, PAGE_SIZE);
> 
> 	if (v < 0)
> 		return;
>@@ -859,7 +859,7 @@
> 	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_locked(len, bss-len);
> 	kfree(elf_phdata);
> 	return 0;
> }
>diff -Nur linux-2.4.28.orig/arch/sparc64/kernel/binfmt_aout32.c linux-2.4.28/arch/sparc64/kernel/binfmt_aout32.c
>--- linux-2.4.28.orig/arch/sparc64/kernel/binfmt_aout32.c	2005-01-03 20:07:13.922494104 -0200
>+++ linux-2.4.28/arch/sparc64/kernel/binfmt_aout32.c	2005-01-03 20:19:03.241661200 -0200
>@@ -49,7 +49,7 @@
> 	end = PAGE_ALIGN(end);
> 	if (end <= start)
> 		return;
>-	do_brk(start, end - start);
>+	do_brk_locked(start, end - start);
> }
> 
> /*
>@@ -246,10 +246,10 @@
> 	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_locked(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_locked(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 @@
> 
> 	if (N_MAGIC(ex) == OMAGIC) {
> 		loff_t pos = fd_offset;
>-		do_brk(N_TXTADDR(ex) & PAGE_MASK,
>+		do_brk_locked(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 @@
> 
> 		if (!bprm->file->f_op->mmap) {
> 			loff_t pos = fd_offset;
>-			do_brk(0, ex.a_text+ex.a_data);
>+			do_brk_locked(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 @@
> 	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_locked(start_addr + len, bss - len);
> 		retval = error;
> 		if (error != start_addr + len)
> 			goto out;
>diff -Nur linux-2.4.28.orig/fs/binfmt_aout.c linux-2.4.28/fs/binfmt_aout.c
>--- linux-2.4.28.orig/fs/binfmt_aout.c	2005-01-03 20:07:15.971182656 -0200
>+++ linux-2.4.28/fs/binfmt_aout.c	2005-01-03 20:21:35.590500656 -0200
>@@ -45,7 +45,7 @@
> 	end = PAGE_ALIGN(end);
> 	if (end <= start)
> 		return;
>-	do_brk(start, end - start);
>+	do_brk_locked(start, end - start);
> }
> 
> /*
>@@ -312,10 +312,10 @@
> 		loff_t pos = fd_offset;
> 		/* Fuck me plenty... */
> 		/* <AOL></AOL> */
>-		error = do_brk(N_TXTADDR(ex), ex.a_text);
>+		error = do_brk_locked(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_locked(N_DATADDR(ex), ex.a_data);
> 		bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex),
> 			  ex.a_data, &pos);
> 		goto beyond_if;
>@@ -336,7 +336,7 @@
> 		map_size = ex.a_text+ex.a_data;
> #endif
> 
>-		error = do_brk(text_addr & PAGE_MASK, map_size);
>+		error = do_brk_locked(text_addr & PAGE_MASK, map_size);
> 		if (error != (text_addr & PAGE_MASK)) {
> 			send_sig(SIGKILL, current, 0);
> 			return error;
>@@ -370,7 +370,7 @@
> 
> 		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_locked(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),
>@@ -467,7 +467,7 @@
> 			error_time = jiffies;
> 		}
> 
>-		do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
>+		do_brk_locked(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);
>@@ -491,7 +491,7 @@
> 	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_locked(start_addr + len, bss - len);
> 		retval = error;
> 		if (error != start_addr + len)
> 			goto out;
>diff -Nur linux-2.4.28.orig/fs/binfmt_elf.c linux-2.4.28/fs/binfmt_elf.c
>--- linux-2.4.28.orig/fs/binfmt_elf.c	2005-01-03 20:07:15.863199072 -0200
>+++ linux-2.4.28/fs/binfmt_elf.c	2005-01-03 20:20:08.155792752 -0200
>@@ -85,7 +85,7 @@
> 	end = ELF_PAGEALIGN(end);
> 	if (end <= start)
> 		return;
>-	do_brk(start, end - start);
>+	do_brk_locked(start, end - start);
> }
> 
> 
>@@ -361,7 +361,7 @@
> 
> 	/* Map the last of the bss segment */
> 	if (last_bss > elf_bss)
>-		do_brk(elf_bss, last_bss - elf_bss);
>+		do_brk_locked(elf_bss, last_bss - elf_bss);
> 
> 	*interp_load_addr = load_addr;
> 	error = ((unsigned long) interp_elf_ex->e_entry) + load_addr;
>@@ -398,7 +398,7 @@
> 		goto out;
> 	}
> 
>-	do_brk(0, text_data);
>+	do_brk_locked(0, text_data);
> 	if (!interpreter->f_op || !interpreter->f_op->read)
> 		goto out;
> 	if (interpreter->f_op->read(interpreter, addr, text_data, &offset) < 0)
>@@ -406,7 +406,7 @@
> 	flush_icache_range((unsigned long)addr,
> 	                   (unsigned long)addr + text_data);
> 
>-	do_brk(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),
>+	do_brk_locked(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),
> 		interp_ex->a_bss);
> 	elf_entry = interp_ex->a_entry;
> 
>@@ -920,7 +920,7 @@
> 	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_locked(len, bss - len);
> 	error = 0;
> 
> out_free_ph:
>diff -Nur linux-2.4.28.orig/include/linux/mm.h linux-2.4.28/include/linux/mm.h
>--- linux-2.4.28.orig/include/linux/mm.h	2005-01-03 20:07:14.320433608 -0200
>+++ linux-2.4.28/include/linux/mm.h	2005-01-03 20:23:23.420108064 -0200
>@@ -570,6 +570,7 @@
> 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_locked(unsigned long, unsigned long);
> 
> static inline void __vma_unlink(struct mm_struct * mm, struct vm_area_struct * vma, struct vm_area_struct * prev)
> {
>diff -Nur linux-2.4.28.orig/kernel/ksyms.c linux-2.4.28/kernel/ksyms.c
>--- linux-2.4.28.orig/kernel/ksyms.c	2005-01-03 20:07:15.845201808 -0200
>+++ linux-2.4.28/kernel/ksyms.c	2005-01-03 20:13:58.702958120 -0200
>@@ -88,6 +88,7 @@
> EXPORT_SYMBOL(do_mmap_pgoff);
> EXPORT_SYMBOL(do_munmap);
> EXPORT_SYMBOL(do_brk);
>+EXPORT_SYMBOL(do_brk_locked);
> EXPORT_SYMBOL(exit_mm);
> EXPORT_SYMBOL(exit_files);
> EXPORT_SYMBOL(exit_fs);
>diff -Nur linux-2.4.28.orig/mm/mmap.c linux-2.4.28/mm/mmap.c
>--- linux-2.4.28.orig/mm/mmap.c	2005-01-03 20:07:15.852200744 -0200
>+++ linux-2.4.28/mm/mmap.c	2005-01-03 20:13:14.122735344 -0200
>@@ -1116,6 +1116,21 @@
> 	return addr;
> }
> 
>+/* locking version of do_brk. */
>+unsigned long do_brk_locked(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