1 files changed, 28 insertions, 8 deletions

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 9d3b572d4dec..2cad66a4cacb 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1175,19 +1175,29 @@ static int
 bpf_prog_load_check_attach_type(enum bpf_prog_type prog_type,
                                 enum bpf_attach_type expected_attach_type)
 {
-        /* There are currently no prog types that require specifying
-         * attach_type at load time.
-         */
-        return 0;
+        switch (prog_type) {
+        case BPF_PROG_TYPE_CGROUP_SOCK_ADDR:
+                switch (expected_attach_type) {
+                case BPF_CGROUP_INET4_BIND:
+                case BPF_CGROUP_INET6_BIND:
+                        return 0;
+                default:
+                        return -EINVAL;
+                }
+        default:
+                return 0;
+        }
 }
 
 static int bpf_prog_attach_check_attach_type(const struct bpf_prog *prog,
                                              enum bpf_attach_type attach_type)
 {
-        /* There are currently no prog types that require specifying
-         * attach_type at load time.
-         */
-        return 0;
+        switch (prog->type) {
+        case BPF_PROG_TYPE_CGROUP_SOCK_ADDR:
+                return attach_type == prog->expected_attach_type ? 0 : -EINVAL;
+        default:
+                return 0;
+        }
 }
 
 /* last field in 'union bpf_attr' used by this command */
@@ -1479,6 +1489,10 @@ static int bpf_prog_attach(const union bpf_attr *attr)
         case BPF_CGROUP_INET_SOCK_CREATE:
                 ptype = BPF_PROG_TYPE_CGROUP_SOCK;
                 break;
+        case BPF_CGROUP_INET4_BIND:
+        case BPF_CGROUP_INET6_BIND:
+                ptype = BPF_PROG_TYPE_CGROUP_SOCK_ADDR;
+                break;
         case BPF_CGROUP_SOCK_OPS:
                 ptype = BPF_PROG_TYPE_SOCK_OPS;
                 break;
@@ -1541,6 +1555,10 @@ static int bpf_prog_detach(const union bpf_attr *attr)
         case BPF_CGROUP_INET_SOCK_CREATE:
                 ptype = BPF_PROG_TYPE_CGROUP_SOCK;
                 break;
+        case BPF_CGROUP_INET4_BIND:
+        case BPF_CGROUP_INET6_BIND:
+                ptype = BPF_PROG_TYPE_CGROUP_SOCK_ADDR;
+                break;
         case BPF_CGROUP_SOCK_OPS:
                 ptype = BPF_PROG_TYPE_SOCK_OPS;
                 break;
@@ -1590,6 +1608,8 @@ static int bpf_prog_query(const union bpf_attr *attr,
         case BPF_CGROUP_INET_INGRESS:
         case BPF_CGROUP_INET_EGRESS:
         case BPF_CGROUP_INET_SOCK_CREATE:
+        case BPF_CGROUP_INET4_BIND:
+        case BPF_CGROUP_INET6_BIND:
         case BPF_CGROUP_SOCK_OPS:
         case BPF_CGROUP_DEVICE:
                 break;