]> git.baikalelectronics.ru Git - kernel.git/commit
s390/bpf: use 32-bit index for tail calls
authorIlya Leoshkevich <iii@linux.ibm.com>
Mon, 12 Aug 2019 16:18:07 +0000 (18:18 +0200)
committerDaniel Borkmann <daniel@iogearbox.net>
Tue, 13 Aug 2019 14:07:13 +0000 (16:07 +0200)
commitff9ae9910f40b0e688e148cd127abd4e8cfb459c
tree2755a796763324928a570c322302fd15b3f17a30
parente6a7ec2961b05d9c1233b0044aba0b4d66d39e67
s390/bpf: use 32-bit index for tail calls

"p runtime/jit: pass > 32bit index to tail_call" fails when
bpf_jit_enable=1, because the tail call is not executed.

This in turn is because the generated code assumes index is 64-bit,
while it must be 32-bit, and as a result prog array bounds check fails,
while it should pass. Even if bounds check would have passed, the code
that follows uses 64-bit index to compute prog array offset.

Fix by using clrj instead of clgrj for comparing index with array size,
and also by using llgfr for truncating index to 32 bits before using it
to compute prog array offset.

Fixes: 443aaa1c04d4 ("s390/bpf: implement bpf_tail_call() helper")
Reported-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Acked-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
arch/s390/net/bpf_jit_comp.c