On 12/14/2017 06:47 PM, Greg KH wrote:

On Wed, Dec 13, 2017 at 03:38:01PM +0100, Daniel Borkmann wrote:

...

Hi Greg,

It would be great if you could cherry-pick the following BPF related commit into stable trees:

c131187db2d3 ("bpf: fix branch pruning logic") - up to 4.9

Instructions for 4.14:

There's a minor conflict in verifier.c, just take the
'env->insn_aux_data[insn_idx].seen = true;' part from
the patch.

Instructions for 4.9:

Needs 8041902dae52 ("bpf: adjust insn_aux_data when patching
insns") as prerequisite. Same minor conflict in verifier.c
as with 4.14 described above. The minor one in bpf_verifier.h
for struct bpf_insn_aux_data should be resolved by having
'ptr_type' and 'seen' as final members of the struct.

Can you just provide patches that you backported and verified to be correct? That ensures I don't mess it up :)

Sure that's fine. I'll send them tomorrow.

Thanks, Daniel