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;