]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commit - arch/x86/net/bpf_jit_comp32.c
bpf, x86_32: Fix clobbering of dst for BPF_JSET
authorLuke Nelson <lukenels@cs.washington.edu>
Wed, 22 Apr 2020 17:36:30 +0000 (10:36 -0700)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 25 May 2020 08:42:09 +0000 (10:42 +0200)
commit3e4bd583d0270727dce06ad4d5796ae292f78b15
treefea59c2b4ae9d847eae995f3f9d33993dce44846
parent90caf0b5c69fd4d9a35a23c6e7db208c0e57b3b4
bpf, x86_32: Fix clobbering of dst for BPF_JSET

BugLink: https://bugs.launchpad.net/bugs/1876765
commit 50fe7ebb6475711c15b3397467e6424e20026d94 upstream.

The current JIT clobbers the destination register for BPF_JSET BPF_X
and BPF_K by using "and" and "or" instructions. This is fine when the
destination register is a temporary loaded from a register stored on
the stack but not otherwise.

This patch fixes the problem (for both BPF_K and BPF_X) by always loading
the destination register into temporaries since BPF_JSET should not
modify the destination register.

This bug may not be currently triggerable as BPF_REG_AX is the only
register not stored on the stack and the verifier uses it in a limited
way.

Fixes: 03f5781be2c7b ("bpf, x86_32: add eBPF JIT compiler for ia32")
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luke Nelson <luke.r.nels@gmail.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Wang YanQing <udknight@gmail.com>
Link: https://lore.kernel.org/bpf/20200422173630.8351-2-luke.r.nels@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
arch/x86/net/bpf_jit_comp32.c