openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bpf, test, cgroup: Use sk_{alloc,free} for test cases 

BPF test infra has some hacks in place which kzalloc() a socket and perform
minimum init via sock_net_set() and sock_init_data(). As a result, the sk's
skcd->cgroup is NULL since it didn't go through proper initialization as it
would have been the case from sk_alloc(). Rather than re-adding a NULL test
in sock_cgroup_ptr() just for this, use sk_{alloc,free}() pair for the test
socket. The latter also allows to get rid of the bpf_sk_storage_free() special
case.

Fixes: 8520e224f5 ("bpf, cgroups: Fix cgroup v2 fallback on v1/v2 mixed mode")
Fixes: b7a1848e83 ("bpf: add BPF_PROG_TEST_RUN support for flow dissector")
Fixes: 2cb494a36c ("bpf: add tests for direct packet access from CGROUP_SKB")
Reported-by: syzbot+664b58e9a40fbb2cec71@syzkaller.appspotmail.com
Reported-by: syzbot+33f36d0754d4c5c0e102@syzkaller.appspotmail.com
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Tested-by: syzbot+664b58e9a40fbb2cec71@syzkaller.appspotmail.com
Tested-by: syzbot+33f36d0754d4c5c0e102@syzkaller.appspotmail.com
Link: https://lore.kernel.org/bpf/20210927123921.21535-2-daniel@iogearbox.net
This commit is contained in:
Daniel Borkmann 2021-09-27 14:39:21 +02:00
parent 78cc316e95
commit 435b08ec00
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/bpf/test_run.c
View File

@ -552,6 +552,12 @@ static void convert_skb_to___skb(struct sk_buff *skb, struct __sk_buff *__skb)
__skb->gso_segs = skb_shinfo(skb)->gso_segs; __skb->gso_segs = skb_shinfo(skb)->gso_segs;
} }
static struct proto bpf_dummy_proto = {
.name = "bpf_dummy",
.owner = THIS_MODULE,
.obj_size = sizeof(struct sock),
};
int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,
union bpf_attr __user *uattr) union bpf_attr __user *uattr)
{ {
@ -596,20 +602,19 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,
break; break;
} }
sk = kzalloc(sizeof(struct sock), GFP_USER); sk = sk_alloc(net, AF_UNSPEC, GFP_USER, &bpf_dummy_proto, 1);
if (!sk) { if (!sk) {
kfree(data); kfree(data);
kfree(ctx); kfree(ctx);
return -ENOMEM; return -ENOMEM;
} }
sock_net_set(sk, net);
sock_init_data(NULL, sk); sock_init_data(NULL, sk);
skb = build_skb(data, 0); skb = build_skb(data, 0);
if (!skb) { if (!skb) {
kfree(data); kfree(data);
kfree(ctx); kfree(ctx);
kfree(sk); sk_free(sk);
return -ENOMEM; return -ENOMEM;
} }
skb->sk = sk; skb->sk = sk;
@ -682,8 +687,7 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr,
if (dev && dev != net->loopback_dev) if (dev && dev != net->loopback_dev)
dev_put(dev); dev_put(dev);
kfree_skb(skb); kfree_skb(skb);
bpf_sk_storage_free(sk); sk_free(sk);
kfree(sk);
kfree(ctx); kfree(ctx);
return ret; return ret;
} }