aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Gheorghiu <gheorghiuandru@gmail.com>2013-03-09 06:57:28 -0500
committerTony Luck <tony.luck@intel.com>2013-03-11 15:13:21 -0400
commiteeb65d9cb5159752e672b5164110838bb5936a4a (patch)
treee1d2400c828ca0956f1bb3b7c39c04d3cb7ab988
parentf6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff)
fs: pstore: Replaced calls to kmalloc and memcpy with kmemdup
Replaced calls to kmalloc and memcpy with a single call to kmemdup. This patch was found using coccicheck. Signed-off-by: Alexandru Gheorghiu <gheorghiuandru@gmail.com> Acked-by: Kees Cook <keescook@chromium.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--fs/pstore/ram.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 288f068740f6..38babb3a9384 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -156,10 +156,9 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
156 time->tv_nsec = 0; 156 time->tv_nsec = 0;
157 157
158 size = persistent_ram_old_size(prz); 158 size = persistent_ram_old_size(prz);
159 *buf = kmalloc(size, GFP_KERNEL); 159 *buf = kmemdup(persistent_ram_old(prz), size, GFP_KERNEL);
160 if (*buf == NULL) 160 if (*buf == NULL)
161 return -ENOMEM; 161 return -ENOMEM;
162 memcpy(*buf, persistent_ram_old(prz), size);
163 162
164 return size; 163 return size;
165} 164}