1 files changed, 26 insertions, 11 deletions

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index b927da66f653..51bee695d32c 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1168,6 +1168,9 @@ static int sockmap_get_from_fd(const union bpf_attr *attr, bool attach)
         return 0;
 }
 
+#define BPF_F_ATTACH_MASK \
+        (BPF_F_ALLOW_OVERRIDE | BPF_F_ALLOW_MULTI)
+
 static int bpf_prog_attach(const union bpf_attr *attr)
 {
         enum bpf_prog_type ptype;
@@ -1181,7 +1184,7 @@ static int bpf_prog_attach(const union bpf_attr *attr)
         if (CHECK_ATTR(BPF_PROG_ATTACH))
                 return -EINVAL;
 
-        if (attr->attach_flags & ~BPF_F_ALLOW_OVERRIDE)
+        if (attr->attach_flags & ~BPF_F_ATTACH_MASK)
                 return -EINVAL;
 
         switch (attr->attach_type) {
@@ -1212,8 +1215,8 @@ static int bpf_prog_attach(const union bpf_attr *attr)
                 return PTR_ERR(cgrp);
         }
 
-        ret = cgroup_bpf_update(cgrp, prog, attr->attach_type,
-                                attr->attach_flags & BPF_F_ALLOW_OVERRIDE);
+        ret = cgroup_bpf_attach(cgrp, prog, attr->attach_type,
+                                attr->attach_flags);
         if (ret)
                 bpf_prog_put(prog);
         cgroup_put(cgrp);
@@ -1225,6 +1228,8 @@ static int bpf_prog_attach(const union bpf_attr *attr)
 
 static int bpf_prog_detach(const union bpf_attr *attr)
 {
+        enum bpf_prog_type ptype;
+        struct bpf_prog *prog;
         struct cgroup *cgrp;
         int ret;
 
@@ -1237,23 +1242,33 @@ static int bpf_prog_detach(const union bpf_attr *attr)
         switch (attr->attach_type) {
         case BPF_CGROUP_INET_INGRESS:
         case BPF_CGROUP_INET_EGRESS:
+                ptype = BPF_PROG_TYPE_CGROUP_SKB;
+                break;
         case BPF_CGROUP_INET_SOCK_CREATE:
+                ptype = BPF_PROG_TYPE_CGROUP_SOCK;
+                break;
         case BPF_CGROUP_SOCK_OPS:
-                cgrp = cgroup_get_from_fd(attr->target_fd);
-                if (IS_ERR(cgrp))
-                        return PTR_ERR(cgrp);
-
-                ret = cgroup_bpf_update(cgrp, NULL, attr->attach_type, false);
-                cgroup_put(cgrp);
+                ptype = BPF_PROG_TYPE_SOCK_OPS;
                 break;
         case BPF_SK_SKB_STREAM_PARSER:
         case BPF_SK_SKB_STREAM_VERDICT:
-                ret = sockmap_get_from_fd(attr, false);
-                break;
+                return sockmap_get_from_fd(attr, false);
         default:
                 return -EINVAL;
         }
 
+        cgrp = cgroup_get_from_fd(attr->target_fd);
+        if (IS_ERR(cgrp))
+                return PTR_ERR(cgrp);
+
+        prog = bpf_prog_get_type(attr->attach_bpf_fd, ptype);
+        if (IS_ERR(prog))
+                prog = NULL;
+
+        ret = cgroup_bpf_detach(cgrp, prog, attr->attach_type, 0);
+        if (prog)
+                bpf_prog_put(prog);
+        cgroup_put(cgrp);
         return ret;
 }