projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86ce322
)
bpf: Change 'BPF_ADD' to 'BPF_AND' in print_bpf_insn()
author
Menglong Dong
<dong.menglong@zte.com.cn>
Wed, 27 Jan 2021 02:25:07 +0000
(18:25 -0800)
committer
Daniel Borkmann
<daniel@iogearbox.net>
Wed, 27 Jan 2021 21:23:46 +0000
(22:23 +0100)
This 'BPF_ADD' is duplicated, and I belive it should be 'BPF_AND'.
Fixes:
981f94c3e921
("bpf: Add bitwise atomic instructions")
Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Brendan Jackman <jackmanb@google.com>
Link:
https://lore.kernel.org/bpf/20210127022507.23674-1-dong.menglong@zte.com.cn
kernel/bpf/disasm.c
patch
|
blob
|
blame
|
history
diff --git
a/kernel/bpf/disasm.c
b/kernel/bpf/disasm.c
index 19ff8fed7f4b0d2828305b22d13f90a10968af8f..3acc7e0b69169fd0566762363e15f95f946c2741 100644
(file)
--- a/
kernel/bpf/disasm.c
+++ b/
kernel/bpf/disasm.c
@@
-161,7
+161,7
@@
void print_bpf_insn(const struct bpf_insn_cbs *cbs,
insn->dst_reg,
insn->off, insn->src_reg);
else if (BPF_MODE(insn->code) == BPF_ATOMIC &&
- (insn->imm == BPF_ADD || insn->imm == BPF_A
D
D ||
+ (insn->imm == BPF_ADD || insn->imm == BPF_A
N
D ||
insn->imm == BPF_OR || insn->imm == BPF_XOR)) {
verbose(cbs->private_data, "(%02x) lock *(%s *)(r%d %+d) %s r%d\n",
insn->code,