p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'cls_bpf' 

Daniel Borkmann says:

====================
Two cls_bpf fixes

Found them while doing a review on act_bpf and going over the
cls_bpf code again. Will also address the first issue in act_bpf
as it needs to be fixed there, too.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2015-01-26 15:50:24 -08:00
parent 9e79ce66c6 3f2ab13594
commit b6663ad702
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/sched/cls_bpf.c
View File

@ -180,6 +180,11 @@ static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp,
} }
bpf_size = bpf_len * sizeof(*bpf_ops); bpf_size = bpf_len * sizeof(*bpf_ops);
if (bpf_size != nla_len(tb[TCA_BPF_OPS])) {
ret = -EINVAL;
goto errout;
}
bpf_ops = kzalloc(bpf_size, GFP_KERNEL); bpf_ops = kzalloc(bpf_size, GFP_KERNEL);
if (bpf_ops == NULL) { if (bpf_ops == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
@ -215,15 +220,21 @@ static u32 cls_bpf_grab_new_handle(struct tcf_proto *tp,
struct cls_bpf_head *head) struct cls_bpf_head *head)
{ {
unsigned int i = 0x80000000; unsigned int i = 0x80000000;
u32 handle;
do { do {
if (++head->hgen == 0x7FFFFFFF) if (++head->hgen == 0x7FFFFFFF)
head->hgen = 1; head->hgen = 1;
} while (--i > 0 && cls_bpf_get(tp, head->hgen)); } while (--i > 0 && cls_bpf_get(tp, head->hgen));
if (i == 0)
pr_err("Insufficient number of handles\n");
return i; if (unlikely(i == 0)) {
pr_err("Insufficient number of handles\n");
handle = 0;
} else {
handle = head->hgen;
}
return handle;
} }
static int cls_bpf_change(struct net *net, struct sk_buff *in_skb, static int cls_bpf_change(struct net *net, struct sk_buff *in_skb,