| Message ID | 20211208030451.219751-3-xiujianfeng@huawei.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF |
| Headers | show |
| Series | Introduce memset_range() helper for wiping members | expand |
| Context | Check | Description |
|---|---|---|
| bpf/vmtest-bpf-next | pending | VM_Test |
| bpf/vmtest-bpf-next-PR | pending | PR summary |
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply |
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); }
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(-)