From: Thomas Meyer <thomas@m3y3r.de>
Date: Sat, 1 Jun 2013 09:40:02 +0000 (+0200)
Subject: efi, pstore: Cocci spatch "memdup.spatch"
X-Git-Tag: firefly_0821_release~3680^2~36^2~41^2~50
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=01bcc35baaa09d0dc8ac6f90dfe5b90e0efaa6f9;p=firefly-linux-kernel-4.4.55.git

efi, pstore: Cocci spatch "memdup.spatch"

Change a kmalloc() + memcpy() pair for a single kmemdup() call.

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
(cherry picked from commit 77418921649427577143667fcf00ccb8a809762a)
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c
index 202d2c85ba2e..c692bb662178 100644
--- a/drivers/firmware/efi/efi-pstore.c
+++ b/drivers/firmware/efi/efi-pstore.c
@@ -79,10 +79,9 @@ static int efi_pstore_read_func(struct efivar_entry *entry, void *data)
 			   &entry->var.DataSize, entry->var.Data);
 	size = entry->var.DataSize;
 
-	*cb_data->buf = kmalloc(size, GFP_KERNEL);
+	*cb_data->buf = kmemdup(entry->var.Data, size, GFP_KERNEL);
 	if (*cb_data->buf == NULL)
 		return -ENOMEM;
-	memcpy(*cb_data->buf, entry->var.Data, size);
 	return size;
 }