Merge tag 'trace-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[karo-tx-linux.git] / net / kcm / kcmsock.c

diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c
index 0b68ba730a067ad4d9be9d75f42034d709a762aa..cb39e05b166cf5eaa0729b775f3ee0b8a140398a 100644 (file)
--- a/net/kcm/kcmsock.c
+++ b/net/kcm/kcmsock.c
@@ -1765,18 +1765,12 @@ static int kcm_attach_ioctl(struct socket *sock, struct kcm_attach *info)
        if (!csock)
                return -ENOENT;
 
-       prog = bpf_prog_get(info->bpf_fd);
+       prog = bpf_prog_get_type(info->bpf_fd, BPF_PROG_TYPE_SOCKET_FILTER);
        if (IS_ERR(prog)) {
                err = PTR_ERR(prog);
                goto out;
        }
 
-       if (prog->type != BPF_PROG_TYPE_SOCKET_FILTER) {
-               bpf_prog_put(prog);
-               err = -EINVAL;
-               goto out;
-       }
-
        err = kcm_attach(sock, csock, prog);
        if (err) {
                bpf_prog_put(prog);