[PARISC] futex: special case cmpxchg NULL in kernel space

[sfrench/cifs-2.6.git] / mm / util.c

diff --git a/mm/util.c b/mm/util.c
index 5f64026cbb4d0f6c053a539ffb0d723255da85f3..8f18683825bcd0e3b95b4fe1754befb3e0b0268c 100644 (file)
--- 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;