From: Yafang Shao <laoar.shao@gmail.com>
To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
martin.lau@linux.dev, song@kernel.org, yhs@fb.com,
john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com,
haoluo@google.com, jolsa@kernel.org, quentin@isovalent.com
Cc: bpf@vger.kernel.org, Yafang Shao <laoar.shao@gmail.com>
Subject: [PATCH bpf-next 4/6] bpf: Add a common helper bpf_copy_to_user()
Date: Fri, 2 Jun 2023 08:52:37 +0000 [thread overview]
Message-ID: <20230602085239.91138-5-laoar.shao@gmail.com> (raw)
In-Reply-To: <20230602085239.91138-1-laoar.shao@gmail.com>
Add a common helper bpf_copy_to_user(), which will be used at multiple
places.
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
---
kernel/bpf/syscall.c | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 92a57ef..80c9ec0 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -3234,6 +3234,25 @@ static void bpf_raw_tp_link_show_fdinfo(const struct bpf_link *link,
raw_tp_link->btp->tp->name);
}
+static int bpf_copy_to_user(char __user *ubuf, const char *buf, u32 ulen,
+ u32 len)
+{
+ if (ulen >= len + 1) {
+ if (copy_to_user(ubuf, buf, len + 1))
+ return -EFAULT;
+ } else {
+ char zero = '\0';
+
+ if (copy_to_user(ubuf, buf, ulen - 1))
+ return -EFAULT;
+ if (put_user(zero, ubuf + ulen - 1))
+ return -EFAULT;
+ return -ENOSPC;
+ }
+
+ return 0;
+}
+
static int bpf_raw_tp_link_fill_link_info(const struct bpf_link *link,
struct bpf_link_info *info)
{
@@ -3252,20 +3271,7 @@ static int bpf_raw_tp_link_fill_link_info(const struct bpf_link *link,
if (!ubuf)
return 0;
- if (ulen >= tp_len + 1) {
- if (copy_to_user(ubuf, tp_name, tp_len + 1))
- return -EFAULT;
- } else {
- char zero = '\0';
-
- if (copy_to_user(ubuf, tp_name, ulen - 1))
- return -EFAULT;
- if (put_user(zero, ubuf + ulen - 1))
- return -EFAULT;
- return -ENOSPC;
- }
-
- return 0;
+ return bpf_copy_to_user(ubuf, tp_name, ulen, tp_len);
}
static const struct bpf_link_ops bpf_raw_tp_link_lops = {
--
1.8.3.1
next prev parent reply other threads:[~2023-06-02 8:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-02 8:52 [PATCH bpf-next 0/6] bpf: Support ->fill_link_info for kprobe prog Yafang Shao
2023-06-02 8:52 ` [PATCH bpf-next 1/6] bpf: Support ->fill_link_info for kprobe_multi Yafang Shao
2023-06-02 16:45 ` Stanislav Fomichev
2023-06-04 3:21 ` Yafang Shao
2023-06-03 6:38 ` kernel test robot
2023-06-04 3:22 ` Yafang Shao
2023-06-02 8:52 ` [PATCH bpf-next 2/6] bpftool: Show probed function in kprobe_multi link info Yafang Shao
2023-06-02 20:36 ` Alexei Starovoitov
2023-06-04 3:24 ` Yafang Shao
2023-06-02 22:16 ` Andrii Nakryiko
2023-06-04 3:26 ` Yafang Shao
2023-06-02 8:52 ` [PATCH bpf-next 3/6] bpf: Always expose the probed address Yafang Shao
2023-06-02 8:52 ` Yafang Shao [this message]
2023-06-02 8:52 ` [PATCH bpf-next 5/6] bpf: Support ->fill_link_info for perf_event Yafang Shao
2023-06-02 22:19 ` Andrii Nakryiko
2023-06-04 3:28 ` Yafang Shao
2023-06-02 8:52 ` [PATCH bpf-next 6/6] bpftool: Show probed function in perf_event link info Yafang Shao
2023-06-02 20:38 ` Alexei Starovoitov
2023-06-04 3:23 ` Yafang Shao
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=20230602085239.91138-5-laoar.shao@gmail.com \
--to=laoar.shao@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=martin.lau@linux.dev \
--cc=quentin@isovalent.com \
--cc=sdf@google.com \
--cc=song@kernel.org \
--cc=yhs@fb.com \
/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).