From: Xiu Jianfeng <xiujianfeng@huawei.com>
To: <akpm@linux-foundation.org>, <keescook@chromium.org>,
<laniel_francis@privacyrequired.com>,
<andriy.shevchenko@linux.intel.com>, <adobriyan@gmail.com>,
<linux@roeck-us.net>, <andreyknvl@gmail.com>, <dja@axtens.net>,
<ast@kernel.org>, <daniel@iogearbox.net>, <andrii@kernel.org>,
<kafai@fb.com>, <songliubraving@fb.com>, <yhs@fb.com>,
<john.fastabend@gmail.com>, <kpsingh@kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>,
<bpf@vger.kernel.org>
Subject: [PATCH -next 2/2] bpf: use memset_range helper in __mark_reg_known
Date: Wed, 8 Dec 2021 11:04:51 +0800 [thread overview]
Message-ID: <20211208030451.219751-3-xiujianfeng@huawei.com> (raw)
In-Reply-To: <20211208030451.219751-1-xiujianfeng@huawei.com>
Replace the open-coded memset with memset_range helper to simplify
the code, there is no functional change in this patch.
Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
---
kernel/bpf/verifier.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 7a20e12f2e45..317f259c0103 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -1099,9 +1099,8 @@ static void ___mark_reg_known(struct bpf_reg_state *reg, u64 imm)
*/
static void __mark_reg_known(struct bpf_reg_state *reg, u64 imm)
{
- /* Clear id, off, and union(map_ptr, range) */
- memset(((u8 *)reg) + sizeof(reg->type), 0,
- offsetof(struct bpf_reg_state, var_off) - sizeof(reg->type));
+ /* Clear off, union(map_ptr, range), id, and ref_obj_id */
+ memset_range(reg, 0, off, ref_obj_id);
___mark_reg_known(reg, imm);
}
--
2.17.1
next prev parent reply other threads:[~2021-12-08 3:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-08 3:04 [PATCH -next 0/2] Introduce memset_range() helper for wiping members Xiu Jianfeng
2021-12-08 3:04 ` [PATCH -next 1/2] string.h: Introduce memset_range() " Xiu Jianfeng
2021-12-08 4:28 ` Andrew Morton
2021-12-08 10:30 ` xiujianfeng
2021-12-08 23:44 ` Andrew Morton
2021-12-09 5:17 ` Kees Cook
2021-12-09 6:29 ` xiujianfeng
2021-12-09 6:29 ` xiujianfeng
2021-12-08 17:12 ` Alexey Dobriyan
2021-12-08 3:04 ` Xiu Jianfeng [this message]
2021-12-08 5:27 ` [PATCH -next 0/2] Introduce memset_range() helper " Kees Cook
2021-12-08 10:30 ` xiujianfeng
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=20211208030451.219751-3-xiujianfeng@huawei.com \
--to=xiujianfeng@huawei.com \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@gmail.com \
--cc=andrii@kernel.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=dja@axtens.net \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=keescook@chromium.org \
--cc=kpsingh@kernel.org \
--cc=laniel_francis@privacyrequired.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--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