diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-22 14:46:24 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-22 14:46:24 -0800 |
| commit | bb27d4998a9e8767674e8eda225c82cc149e5bc8 (patch) | |
| tree | dcabb8b8cc510003637323b30ed414b1a1ec86f6 /kernel/bpf/verifier.c | |
| parent | 9676e84dfd641e3366a41f2c45ac5c55dbac820f (diff) | |
| parent | 35bf7692e765c2275bf93fe573f7ca868ab73453 (diff) | |
| download | linux-bb27d4998a9e8767674e8eda225c82cc149e5bc8.tar.bz2 | |
Merge char-misc-next into staging-next
This resolves the merge issues and confusions people were having with
the goldfish drivers due to changes for them showing up in two different
trees.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/bpf/verifier.c')
| -rw-r--r-- | kernel/bpf/verifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index d1d3e8f57de9..2e7f7ab739e4 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -2082,7 +2082,7 @@ static void adjust_branches(struct bpf_prog *prog, int pos, int delta) /* adjust offset of jmps if necessary */ if (i < pos && i + insn->off + 1 > pos) insn->off += delta; - else if (i > pos && i + insn->off + 1 < pos) + else if (i > pos + delta && i + insn->off + 1 <= pos + delta) insn->off -= delta; } } |