projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6-block.git]
/
kernel
/
bpf
/
verifier.c
diff --git
a/kernel/bpf/verifier.c
b/kernel/bpf/verifier.c
index 36dc497deaa3bc601ac39a21446c6aaa9461b893..2e08f8e9b771f032a17e0305c60fcd6f0403e6f5 100644
(file)
--- a/
kernel/bpf/verifier.c
+++ b/
kernel/bpf/verifier.c
@@
-2108,7
+2108,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;
}
}