1 files changed, 50 insertions, 1 deletions

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 17e29f596de1..d2f2bdf71ffa 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1087,7 +1087,50 @@ static int bpf_obj_get(const union bpf_attr *attr)
 
 #ifdef CONFIG_CGROUP_BPF
 
-#define BPF_PROG_ATTACH_LAST_FIELD attach_flags
+#define BPF_PROG_ATTACH_LAST_FIELD attach_bpf_fd2
+
+static int sockmap_get_from_fd(const union bpf_attr *attr, int ptype)
+{
+        struct bpf_prog *prog1, *prog2;
+        int ufd = attr->target_fd;
+        struct bpf_map *map;
+        struct fd f;
+        int err;
+
+        f = fdget(ufd);
+        map = __bpf_map_get(f);
+        if (IS_ERR(map))
+                return PTR_ERR(map);
+
+        if (!map->ops->map_attach) {
+                fdput(f);
+                return -EOPNOTSUPP;
+        }
+
+        prog1 = bpf_prog_get_type(attr->attach_bpf_fd, ptype);
+        if (IS_ERR(prog1)) {
+                fdput(f);
+                return PTR_ERR(prog1);
+        }
+
+        prog2 = bpf_prog_get_type(attr->attach_bpf_fd2, ptype);
+        if (IS_ERR(prog2)) {
+                fdput(f);
+                bpf_prog_put(prog1);
+                return PTR_ERR(prog2);
+        }
+
+        err = map->ops->map_attach(map, prog1, prog2);
+        if (err) {
+                fdput(f);
+                bpf_prog_put(prog1);
+                bpf_prog_put(prog2);
+                return PTR_ERR(map);
+        }
+
+        fdput(f);
+        return err;
+}
 
 static int bpf_prog_attach(const union bpf_attr *attr)
 {
@@ -1116,10 +1159,16 @@ static int bpf_prog_attach(const union bpf_attr *attr)
         case BPF_CGROUP_SOCK_OPS:
                 ptype = BPF_PROG_TYPE_SOCK_OPS;
                 break;
+        case BPF_CGROUP_SMAP_INGRESS:
+                ptype = BPF_PROG_TYPE_SK_SKB;
+                break;
         default:
                 return -EINVAL;
         }
 
+        if (attr->attach_type == BPF_CGROUP_SMAP_INGRESS)
+                return sockmap_get_from_fd(attr, ptype);
+
         prog = bpf_prog_get_type(attr->attach_bpf_fd, ptype);
         if (IS_ERR(prog))
                 return PTR_ERR(prog);