fix mm/util.c:krealloc()
Commit ef8b4520bd
added one NULL check for
"p" in krealloc(), but that doesn't seem to be enough since there
doesn't seem to be any guarantee that memcpy(ret, NULL, 0) works
(spotted by the Coverity checker).
For making it clearer what happens this patch also removes the pointless
min().
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d5cd97872d
commit
be21f0ab0d
|
@ -95,8 +95,8 @@ void *krealloc(const void *p, size_t new_size, gfp_t flags)
|
||||||
return (void *)p;
|
return (void *)p;
|
||||||
|
|
||||||
ret = kmalloc_track_caller(new_size, flags);
|
ret = kmalloc_track_caller(new_size, flags);
|
||||||
if (ret) {
|
if (ret && p) {
|
||||||
memcpy(ret, p, min(new_size, ks));
|
memcpy(ret, p, ks);
|
||||||
kfree(p);
|
kfree(p);
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in New Issue