From: David S. Miller <davem@davemloft.net>
Date: Tue, 31 Mar 2020 02:52:37 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ed52f2c608c9451fa2bad298b2ab927416105d65;p=linux.git

Merge git://git./linux/kernel/git/bpf/bpf-next

Signed-off-by: David S. Miller <davem@davemloft.net>
---

ed52f2c608c9451fa2bad298b2ab927416105d65
diff --cc kernel/bpf/cgroup.c
index 4f1472409ef8f,80676fc00d819..cb305e71e7deb
--- a/kernel/bpf/cgroup.c
+++ b/kernel/bpf/cgroup.c
@@@ -305,10 -418,9 +421,9 @@@ int __cgroup_bpf_attach(struct cgroup *
  	u32 saved_flags = (flags & (BPF_F_ALLOW_OVERRIDE | BPF_F_ALLOW_MULTI));
  	struct list_head *progs = &cgrp->bpf.progs[type];
  	struct bpf_prog *old_prog = NULL;
 -	struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE],
 -		*old_storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {NULL};
 +	struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {};
 +	struct bpf_cgroup_storage *old_storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {};
- 	struct bpf_prog_list *pl, *replace_pl = NULL;
- 	enum bpf_cgroup_storage_type stype;
+ 	struct bpf_prog_list *pl;
  	int err;
  
  	if (((flags & BPF_F_ALLOW_OVERRIDE) && (flags & BPF_F_ALLOW_MULTI)) ||
diff --cc kernel/bpf/syscall.c
index f00c00b942dfc,e0a3b34d70396..64783da342020
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@@ -3564,9 -3550,107 +3560,107 @@@ err_put
  	return err;
  }
  
+ #define BPF_LINK_CREATE_LAST_FIELD link_create.flags
+ static int link_create(union bpf_attr *attr)
+ {
+ 	enum bpf_prog_type ptype;
+ 	struct bpf_prog *prog;
+ 	int ret;
+ 
+ 	if (!capable(CAP_NET_ADMIN))
+ 		return -EPERM;
+ 
+ 	if (CHECK_ATTR(BPF_LINK_CREATE))
+ 		return -EINVAL;
+ 
+ 	ptype = attach_type_to_prog_type(attr->link_create.attach_type);
+ 	if (ptype == BPF_PROG_TYPE_UNSPEC)
+ 		return -EINVAL;
+ 
+ 	prog = bpf_prog_get_type(attr->link_create.prog_fd, ptype);
+ 	if (IS_ERR(prog))
+ 		return PTR_ERR(prog);
+ 
+ 	ret = bpf_prog_attach_check_attach_type(prog,
+ 						attr->link_create.attach_type);
+ 	if (ret)
+ 		goto err_out;
+ 
+ 	switch (ptype) {
+ 	case BPF_PROG_TYPE_CGROUP_SKB:
+ 	case BPF_PROG_TYPE_CGROUP_SOCK:
+ 	case BPF_PROG_TYPE_CGROUP_SOCK_ADDR:
+ 	case BPF_PROG_TYPE_SOCK_OPS:
+ 	case BPF_PROG_TYPE_CGROUP_DEVICE:
+ 	case BPF_PROG_TYPE_CGROUP_SYSCTL:
+ 	case BPF_PROG_TYPE_CGROUP_SOCKOPT:
+ 		ret = cgroup_bpf_link_attach(attr, prog);
+ 		break;
+ 	default:
+ 		ret = -EINVAL;
+ 	}
+ 
+ err_out:
+ 	if (ret < 0)
+ 		bpf_prog_put(prog);
+ 	return ret;
+ }
+ 
+ #define BPF_LINK_UPDATE_LAST_FIELD link_update.old_prog_fd
+ 
+ static int link_update(union bpf_attr *attr)
+ {
+ 	struct bpf_prog *old_prog = NULL, *new_prog;
+ 	struct bpf_link *link;
+ 	u32 flags;
+ 	int ret;
+ 
+ 	if (!capable(CAP_NET_ADMIN))
+ 		return -EPERM;
+ 
+ 	if (CHECK_ATTR(BPF_LINK_UPDATE))
+ 		return -EINVAL;
+ 
+ 	flags = attr->link_update.flags;
+ 	if (flags & ~BPF_F_REPLACE)
+ 		return -EINVAL;
+ 
+ 	link = bpf_link_get_from_fd(attr->link_update.link_fd);
+ 	if (IS_ERR(link))
+ 		return PTR_ERR(link);
+ 
+ 	new_prog = bpf_prog_get(attr->link_update.new_prog_fd);
+ 	if (IS_ERR(new_prog))
+ 		return PTR_ERR(new_prog);
+ 
+ 	if (flags & BPF_F_REPLACE) {
+ 		old_prog = bpf_prog_get(attr->link_update.old_prog_fd);
+ 		if (IS_ERR(old_prog)) {
+ 			ret = PTR_ERR(old_prog);
+ 			old_prog = NULL;
+ 			goto out_put_progs;
+ 		}
+ 	}
+ 
+ #ifdef CONFIG_CGROUP_BPF
+ 	if (link->ops == &bpf_cgroup_link_lops) {
+ 		ret = cgroup_bpf_replace(link, old_prog, new_prog);
+ 		goto out_put_progs;
+ 	}
+ #endif
+ 	ret = -EINVAL;
+ 
+ out_put_progs:
+ 	if (old_prog)
+ 		bpf_prog_put(old_prog);
+ 	if (ret)
+ 		bpf_prog_put(new_prog);
+ 	return ret;
+ }
+ 
  SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size)
  {
 -	union bpf_attr attr = {};
 +	union bpf_attr attr;
  	int err;
  
  	if (sysctl_unprivileged_bpf_disabled && !capable(CAP_SYS_ADMIN))