X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=mm%2Futil.c;h=8f18683825bcd0e3b95b4fe1754befb3e0b0268c;hb=cd2fe83a81510acfd1ae29b8ffe04f7ef675c993;hp=5f64026cbb4d0f6c053a539ffb0d723255da85f3;hpb=ef8b4520bd9f8294ffce9abd6158085bde5dc902;p=linux-2.6-omap-h63xx.git

diff --git a/mm/util.c b/mm/util.c
index 5f64026cbb4..8f18683825b 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -95,8 +95,8 @@ void *krealloc(const void *p, size_t new_size, gfp_t flags)
 		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;