diff options
| author |  David S. Miller <davem@davemloft.net>
| 2017-08-04 11:18:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2017-08-04 11:18:01 -0700 |
| commit | 7a97325191eecd1343c819291bce48fe0024f7dd (patch) | |
| tree | 2c279740a51b4998df490a261825494ddffa210f /arch | |
| parent | Merge branch 'mlxsw-Couple-of-fixes' (diff) | |
| parent | bpf, s390: fix build for libbpf and selftest suite (diff) | |
| download | linux-7a97325191eecd1343c819291bce48fe0024f7dd.tar.gz linux-7a97325191eecd1343c819291bce48fe0024f7dd.tar.bz2 linux-7a97325191eecd1343c819291bce48fe0024f7dd.zip | |
Merge branch 's390-bpf-jit-fixes'
Daniel Borkmann says:
====================
Two BPF fixes for s390
Found while testing some other work touching JITs.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/net/bpf_jit_comp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 01c6fbc3e85b..1803797fc885 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -1253,7 +1253,8 @@ static int bpf_jit_prog(struct bpf_jit *jit, struct bpf_prog *fp) insn_count = bpf_jit_insn(jit, fp, i); if (insn_count < 0) return -1; - jit->addrs[i + 1] = jit->prg; /* Next instruction address */ + /* Next instruction address */ + jit->addrs[i + insn_count] = jit->prg; } bpf_jit_epilogue(jit); |