Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix complex atomic instructions handling #2584

Open
wants to merge 1 commit into
base: next
Choose a base branch
from
Open

Fix complex atomic instructions handling #2584

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions arch/BPF/BPFDisassembler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,9 @@ static bpf_insn op2insn_ld_ebpf(unsigned opcode)
#define COMPLEX_CASE(c) \
case BPF_ATOMIC_##c | BPF_MODE_FETCH: \
if (BPF_SIZE(opcode) == BPF_SIZE_DW) \
return BPF_INS_A##c##64;
return BPF_INS_A##c##64; \
else \
return BPF_INS_INVALID;

#define CASE(c) \
case BPF_SIZE_##c: \
Expand Down Expand Up @@ -524,7 +526,7 @@ static bpf_insn op2insn_st(unsigned opcode, const uint32_t imm)
ALU_CASE_FETCH(XOR);
COMPLEX_CASE(XCHG);
COMPLEX_CASE(CMPXCHG);
default: // Could only be reached if complex atomic operation is used without fetch modifier, or not as DW
default: // Reached if complex atomic operation is used without fetch modifier
return BPF_INS_INVALID;
}
}
Expand Down
Loading