diff options
| author | David S. Miller <davem@davemloft.net> | 2019-01-02 16:38:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-02 16:38:59 -0800 |
| commit | be63004336d008b71f93dfe166f503ae2e53a32e (patch) | |
| tree | 38db0067c37cbc861414222be63b2b5c55365ece /include/linux/filter.h | |
| parent | d63967e475ae10f286dbd35e189cb241e0b1f284 (diff) | |
| parent | a67825f5195145f840939d0f85fc40b6b1077329 (diff) | |
| download | linux-next-be63004336d008b71f93dfe166f503ae2e53a32e.tar.gz linux-next-be63004336d008b71f93dfe166f503ae2e53a32e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2019-01-02
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) prevent out of bounds speculation on pointer arithmetic, from Daniel.
2) typo fix, from Xiaozhou.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/filter.h')
| -rw-r--r-- | include/linux/filter.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index 8c8544b375eb..ad106d845b22 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -53,14 +53,10 @@ struct sock_reuseport; #define BPF_REG_D BPF_REG_8 /* data, callee-saved */ #define BPF_REG_H BPF_REG_9 /* hlen, callee-saved */ -/* Kernel hidden auxiliary/helper register for hardening step. - * Only used by eBPF JITs. It's nothing more than a temporary - * register that JITs use internally, only that here it's part - * of eBPF instructions that have been rewritten for blinding - * constants. See JIT pre-step in bpf_jit_blind_constants(). - */ +/* Kernel hidden auxiliary/helper register. */ #define BPF_REG_AX MAX_BPF_REG -#define MAX_BPF_JIT_REG (MAX_BPF_REG + 1) +#define MAX_BPF_EXT_REG (MAX_BPF_REG + 1) +#define MAX_BPF_JIT_REG MAX_BPF_EXT_REG /* unused opcode to mark special call to bpf_tail_call() helper */ #define BPF_TAIL_CALL 0xf0 |