X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=mm%2Futil.c;h=8f18683825bcd0e3b95b4fe1754befb3e0b0268c;hb=4c4a22148909e4c003562ea7ffe0a06e26919e3c;hp=bf340d80686884bf765dc696a73f7fd840842e8f;hpb=d796e641a3eea2109381d6b0af533454f44916fa;p=linux-2.6-omap-h63xx.git

diff --git a/mm/util.c b/mm/util.c
index bf340d80686..8f18683825b 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -81,20 +81,22 @@ EXPORT_SYMBOL(kmemdup);
 void *krealloc(const void *p, size_t new_size, gfp_t flags)
 {
 	void *ret;
-	size_t ks;
+	size_t ks = 0;
 
 	if (unlikely(!new_size)) {
 		kfree(p);
 		return ZERO_SIZE_PTR;
 	}
 
-	ks = ksize(p);
+	if (p)
+		ks = ksize(p);
+
 	if (ks >= new_size)
 		return (void *)p;
 
 	ret = kmalloc_track_caller(new_size, flags);
-	if (ret) {
-		memcpy(ret, p, min(new_size, ks));
+	if (ret && p) {
+		memcpy(ret, p, ks);
 		kfree(p);
 	}
 	return ret;