diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-08-06 14:26:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-05 09:20:10 +0200 |
| commit | 33a9081eaa2c608001ed6dfe6a2e58c2cdd731c6 (patch) | |
| tree | e3fe439af09efcccf860bbcc705a5bdbaba4c00b /arch/s390 | |
| parent | ba064e81be70ecc013f65f65c6c083ec155afd16 (diff) | |
| download | linux-stable-33a9081eaa2c608001ed6dfe6a2e58c2cdd731c6.tar.gz linux-stable-33a9081eaa2c608001ed6dfe6a2e58c2cdd731c6.tar.bz2 linux-stable-33a9081eaa2c608001ed6dfe6a2e58c2cdd731c6.zip | |
s390: fix br_r1_trampoline for machines without exrl
commit 26f843848bae973817b3587780ce6b7b0200d3e4 upstream.
For machines without the exrl instruction the BFP jit generates
code that uses an "br %r1" instruction located in the lowcore page.
Unfortunately there is a cut & paste error that puts an additional
"larl %r1,.+14" instruction in the code that clobbers the branch
target address in %r1. Remove the larl instruction.
Cc: <stable@vger.kernel.org> # v4.17+
Fixes: de5cb6eb51 ("s390: use expoline thunks in the BPF JIT")
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/net/bpf_jit_comp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 949a871e9506..8bd25aebf488 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -517,8 +517,6 @@ static void bpf_jit_epilogue(struct bpf_jit *jit) /* br %r1 */ _EMIT2(0x07f1); } else { - /* larl %r1,.+14 */ - EMIT6_PCREL_RILB(0xc0000000, REG_1, jit->prg + 14); /* ex 0,S390_lowcore.br_r1_tampoline */ EMIT4_DISP(0x44000000, REG_0, REG_0, offsetof(struct lowcore, br_r1_trampoline)); |