bpf: Fix masking negation logic upon negative dst register
authorDaniel Borkmann <daniel@iogearbox.net>
Fri, 30 Apr 2021 14:21:46 +0000 (16:21 +0200)
committerDaniel Borkmann <daniel@iogearbox.net>
Mon, 3 May 2021 09:56:16 +0000 (11:56 +0200)
commitb9b34ddbe2076ade359cd5ce7537d5ed019e9807
tree49fcb2249efc10349d019d367f66d41274edf448
parentf80f88f0e2f2ef9cd805fad1bbf676b0ecd4b55c
bpf: Fix masking negation logic upon negative dst register

The negation logic for the case where the off_reg is sitting in the
dst register is not correct given then we cannot just invert the add
to a sub or vice versa. As a fix, perform the final bitwise and-op
unconditionally into AX from the off_reg, then move the pointer from
the src to dst and finally use AX as the source for the original
pointer arithmetic operation such that the inversion yields a correct
result. The single non-AX mov in between is possible given constant
blinding is retaining it as it's not an immediate based operation.

Fixes: 979d63d50c0c ("bpf: prevent out of bounds speculation on pointer arithmetic")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Tested-by: Piotr Krysiuk <piotras@gmail.com>
Reviewed-by: Piotr Krysiuk <piotras@gmail.com>
Reviewed-by: John Fastabend <john.fastabend@gmail.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/verifier.c