Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be21f0ab authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

fix mm/util.c:krealloc() 



Commit ef8b4520 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: default avatarAdrian Bunk <bunk@kernel.org>
Acked-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d5cd9787

mm/util.c

+2 −2
Original line number Diff line number Diff line
@@ -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;