|
@@ -1226,18 +1226,6 @@ bpf_prog_load_check_attach_type(enum bpf_prog_type prog_type,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static int bpf_prog_attach_check_attach_type(const struct bpf_prog *prog,
|
|
|
- enum bpf_attach_type attach_type)
|
|
|
-{
|
|
|
- switch (prog->type) {
|
|
|
- case BPF_PROG_TYPE_CGROUP_SOCK:
|
|
|
- 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 */
|
|
|
#define BPF_PROG_LOAD_LAST_FIELD expected_attach_type
|
|
|
|
|
@@ -1465,6 +1453,18 @@ out_free_tp:
|
|
|
|
|
|
#ifdef CONFIG_CGROUP_BPF
|
|
|
|
|
|
+static int bpf_prog_attach_check_attach_type(const struct bpf_prog *prog,
|
|
|
+ enum bpf_attach_type attach_type)
|
|
|
+{
|
|
|
+ switch (prog->type) {
|
|
|
+ case BPF_PROG_TYPE_CGROUP_SOCK:
|
|
|
+ case BPF_PROG_TYPE_CGROUP_SOCK_ADDR:
|
|
|
+ return attach_type == prog->expected_attach_type ? 0 : -EINVAL;
|
|
|
+ default:
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
#define BPF_PROG_ATTACH_LAST_FIELD attach_flags
|
|
|
|
|
|
static int sockmap_get_from_fd(const union bpf_attr *attr,
|