ebpf: move read-only fields to bpf_prog and shrink bpf_prog_aux

[deliverable/linux.git] / net / core / filter.c

diff --git a/net/core/filter.c b/net/core/filter.c
index 514d4082f3261b00b65e9c10d6eb852cae0105fd..ff000cb25e0aac712b6287ce350f5948d5ff3a31 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -814,7 +814,7 @@ static void bpf_release_orig_filter(struct bpf_prog *fp)
 
 static void __bpf_prog_release(struct bpf_prog *prog)
 {
-       if (prog->aux->prog_type == BPF_PROG_TYPE_SOCKET_FILTER) {
+       if (prog->type == BPF_PROG_TYPE_SOCKET_FILTER) {
                bpf_prog_put(prog);
        } else {
                bpf_release_orig_filter(prog);
@@ -1105,7 +1105,7 @@ int sk_attach_bpf(u32 ufd, struct sock *sk)
        if (IS_ERR(prog))
                return PTR_ERR(prog);
 
-       if (prog->aux->prog_type != BPF_PROG_TYPE_SOCKET_FILTER) {
+       if (prog->type != BPF_PROG_TYPE_SOCKET_FILTER) {
                bpf_prog_put(prog);
                return -EINVAL;
        }