diff options
| author |   Alexei Starovoitov <ast@fb.com> | 2016-05-05 19:49:12 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-05-06 16:01:54 -0400 |
| commit | db58ba45920255e967cc1d62a430cebd634b5046 (patch) | |
| tree | 6249362f507db4d022929e61069ca3742ab569ef /net/sched/cls_bpf.c | |
| parent | bpf: improve verifier state equivalence (diff) | |
| download | linux-dev-db58ba45920255e967cc1d62a430cebd634b5046.tar.xz linux-dev-db58ba45920255e967cc1d62a430cebd634b5046.zip | |
bpf: wire in data and data_end for cls_act_bpf
allow cls_bpf and act_bpf programs access skb->data and skb->data_end pointers.
The bpf helpers that change skb->data need to update data_end pointer as well.
The verifier checks that programs always reload data, data_end pointers
after calls to such bpf helpers.
We cannot add 'data_end' pointer to struct qdisc_skb_cb directly,
since it's embedded as-is by infiniband ipoib, so wrapper struct is needed.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/cls_bpf.c')
| -rw-r--r-- | net/sched/cls_bpf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c index 425fe6a0eda3..7b342c779da7 100644 --- a/net/sched/cls_bpf.c +++ b/net/sched/cls_bpf.c @@ -96,9 +96,11 @@ static int cls_bpf_classify(struct sk_buff *skb, const struct tcf_proto *tp, if (at_ingress) { /* It is safe to push/pull even if skb_shared() */ __skb_push(skb, skb->mac_len); + bpf_compute_data_end(skb); filter_res = BPF_PROG_RUN(prog->filter, skb); __skb_pull(skb, skb->mac_len); } else { + bpf_compute_data_end(skb); filter_res = BPF_PROG_RUN(prog->filter, skb); } |