[uml-devel] [patch 1/1] Fix malloc-use-vmalloc

[blaisorblade_spam@yahoo.it]

* Avoid allocating more than one page at once: that can require
moving pages around to have two contiguos pages, so we're better
with vmalloc.
* Make sure we free() someway, inside __wrap_free.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
---

 linux-2.4.26-paolo/arch/um/main.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff -puN arch/um/main.c~malloc-use-vmalloc-fix arch/um/main.c
--- linux-2.4.26/arch/um/main.c~malloc-use-vmalloc-fix	2004-07-04 12:52:43.887588064 +0200
+++ linux-2.4.26-paolo/arch/um/main.c	2004-07-04 12:52:43.889587760 +0200
@@ -168,7 +168,7 @@ void *__wrap_malloc(int size)
 
 	if(!CAN_KMALLOC())
 		return(__real_malloc(size));
-	else if(size < 128 * 1024) /* kmalloc is good for only 128K */
+	else if(size <= PAGE_SIZE) /* finding contiguos pages is hard */
 		ret = um_kmalloc(size);
 	else ret = um_vmalloc(size);
 
@@ -213,8 +213,11 @@ void __wrap_free(void *ptr)
 			kfree(ptr);
 		else if((addr >= start_vm) && (addr <= end_vm))
 			vfree(ptr);
+		else
+			__real_free(ptr);
 	}
-	else __real_free(ptr);
+	else
+		__real_free(ptr);
 }
 
 /*
_


-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel