From 021710816f96a1be7d149f5e79ba1e59d3e73c5b Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 14 Nov 2007 17:00:01 -0800
Subject: [PATCH] --- yaml --- r: 73715 b: refs/heads/master c:
 be21f0ab0d8f10c90265066603a8d95b6037a6fa h: refs/heads/master i:   73713:
 e188b2608ce2f5a27c012b706470bf0fa6504485   73711:
 0b1b4d8571e26046bef016c1cf31720c3b7fa8c0 v: v3

---
 [refs]          | 2 +-
 trunk/mm/util.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f4c00eff945a..fc09f6030fb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5cd97872dca9b79c31224ca014bcea7ca01f5f1
+refs/heads/master: be21f0ab0d8f10c90265066603a8d95b6037a6fa
diff --git a/trunk/mm/util.c b/trunk/mm/util.c
index 5f64026cbb4d..8f18683825bc 100644
--- a/trunk/mm/util.c
+++ b/trunk/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;