From: Geliang Tang <geliangtang@gmail.com>
Date: Sat, 29 Apr 2017 01:45:16 +0000 (+0800)
Subject: pstore: use memdup_user
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=077090af337f7d833f82be3d556549512398de66;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

pstore: use memdup_user

Use memdup_user() helper instead of open-coding to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
---

diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 96fbff7b87c8..1b6e0ff6bff5 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -653,19 +653,16 @@ static int pstore_write_user_compat(struct pstore_record *record,
 	if (record->buf)
 		return -EINVAL;
 
-	record->buf = kmalloc(record->size, GFP_KERNEL);
-	if (!record->buf)
-		return -ENOMEM;
-
-	if (unlikely(copy_from_user(record->buf, buf, record->size))) {
-		ret = -EFAULT;
+	record->buf = memdup_user(buf, record->size);
+	if (unlikely(IS_ERR(record->buf))) {
+		ret = PTR_ERR(record->buf);
 		goto out;
 	}
 
 	ret = record->psi->write(record);
 
-out:
 	kfree(record->buf);
+out:
 	record->buf = NULL;
 
 	return unlikely(ret < 0) ? ret : record->size;