Patch "bpf/verifier: reject BPF_ALU64|BPF_END" has been added to the 4.13-stable tree
Subsystems (5)
This is a note to let you know that I've just added the patch titled
bpf/verifier: reject BPF_ALU64|BPF_END
to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bpf-verifier-reject-bpf_alu64-bpf_end.patch
and it can be found in the queue-4.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Oct 9 09:32:35 CEST 2017
From: Edward Cree <[email protected]>
Date: Fri, 15 Sep 2017 14:37:38 +0100
Subject: bpf/verifier: reject BPF_ALU64|BPF_END
From: Edward Cree <[email protected]>
[ Upstream commit e67b8a685c7c984e834e3181ef4619cd7025a136 ]
Neither ___bpf_prog_run nor the JITs accept it.
Also adds a new test case.
--- kernel/bpf/verifier.c | 3 ++- tools/testing/selftests/bpf/test_verifier.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-)
kernel/bpf/verifier.c +2 -1
@@ -1978,7 +1978,8 @@ static int check_alu_op(struct bpf_verif } }else {if (insn->src_reg !=BPF_REG_0 || insn->off !=0 || - (insn->imm !=16 && insn->imm !=32 && insn->imm !=64 )) { + (insn->imm !=16 && insn->imm !=32 && insn->imm !=64 ) || +BPF_CLASS (insn->code) ==BPF_ALU64 ) {verbose ("BPF_END uses reserved fields\n" );return -EINVAL ; }
tools/testing/selftests/bpf/test_verifier.c +16 -0
@@ -6009,6 +6009,22 @@ static struct bpf_test tests[] = { .result = REJECT, .result_unpriv = REJECT, }, + { + "invalid 64-bit BPF_END", + .insns = { + BPF_MOV32_IMM(BPF_REG_0, 0), + { + .code = BPF_ALU64 | BPF_END | BPF_TO_LE, + .dst_reg = BPF_REG_0, + .src_reg = 0, + .off = 0, + .imm =32 , + }, + BPF_EXIT_INSN(), + }, + .errstr ="BPF_END uses reserved fields" , + .result = REJECT, + }, };static int probe_filter_length (const struct bpf_insn *fp)
Patches currently in stable-queue which might be from [email protected] are
queue-4.13/net-change-skb-mac_header-when-generic-xdp-calls-adjust_head.patch queue-4.13/bpf-verifier-reject-bpf_alu64-bpf_end.patch