shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-26 20:40:24 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG"

Browse Source 
This reverts commit 7973a0dad0.

It breaks the abi but we can bring it back later on when the KABI update
happens in a few days.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I01fcc3fd586cb0e748524355403b3871c41df2b7
This commit is contained in:
Greg Kroah-Hartman
2021-04-08 11:11:52 +02:00
parent 4a23c8ded3
commit 21e2297dae
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/net/bpf_jit_comp.c
View File

@@ -1811,8 +1811,7 @@ int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image, void *i
/* remember return value in a stack for bpf prog to access */
emit_stx(&prog, BPF_DW, BPF_REG_FP, BPF_REG_0, -8);
im->ip_after_call = prog;
memcpy(prog, ideal_nops[NOP_ATOMIC5], X86_PATCH_SIZE);
prog += X86_PATCH_SIZE;
emit_nops(&prog, 5);
}
if (fmod_ret->nr_progs) {