From: Yang Yingliang <yangyingliang@huawei.com>
To: <linux-kernel@vger.kernel.org>
Cc: <mhiramat@kernel.org>, <ast@kernel.org>, <jbacik@fb.com>,
<akpm@linux-foundation.org>
Subject: [PATCH -next 1/3] fail_function: Switch to memdup_user_nul() helper
Date: Fri, 26 Aug 2022 15:33:35 +0800 [thread overview]
Message-ID: <20220826073337.2085798-1-yangyingliang@huawei.com> (raw)
Use memdup_user_nul() helper instead of open-coding to
simplify the code.
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
kernel/fail_function.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/kernel/fail_function.c b/kernel/fail_function.c
index 60dc825ecc2b..03643e33e4c3 100644
--- a/kernel/fail_function.c
+++ b/kernel/fail_function.c
@@ -247,15 +247,11 @@ static ssize_t fei_write(struct file *file, const char __user *buffer,
/* cut off if it is too long */
if (count > KSYM_NAME_LEN)
count = KSYM_NAME_LEN;
- buf = kmalloc(count + 1, GFP_KERNEL);
- if (!buf)
- return -ENOMEM;
- if (copy_from_user(buf, buffer, count)) {
- ret = -EFAULT;
- goto out_free;
- }
- buf[count] = '\0';
+ buf = memdup_user_nul(buffer, count);
+ if (IS_ERR(buf))
+ return PTR_ERR(buf);
+
sym = strstrip(buf);
mutex_lock(&fei_lock);
@@ -308,7 +304,6 @@ static ssize_t fei_write(struct file *file, const char __user *buffer,
}
out:
mutex_unlock(&fei_lock);
-out_free:
kfree(buf);
return ret;
}
--
2.25.1
next reply other threads:[~2022-08-26 7:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 7:33 Yang Yingliang [this message]
2022-08-26 7:33 ` [PATCH -next 2/3] fail_function: refctor code of checking return value of register_kprobe() Yang Yingliang
2022-09-12 9:37 ` Masami Hiramatsu
2022-08-26 7:33 ` [PATCH -next 3/3] fail_function: fix wrong use of fei_attr_remove() Yang Yingliang
2022-09-12 9:37 ` [PATCH -next 1/3] fail_function: Switch to memdup_user_nul() helper Masami Hiramatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220826073337.2085798-1-yangyingliang@huawei.com \
--to=yangyingliang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=ast@kernel.org \
--cc=jbacik@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).