Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

diff --git a/net/core/filter.c b/net/core/filter.c
index 95a27fdf9a405cf44f454855fe07392feb14dc78..07687e2a2e661a9a1eda2c506893cf1a99cfe524 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -4462,6 +4462,8 @@ BPF_CALL_3(bpf_bind, struct bpf_sock_addr_kern *, ctx, struct sockaddr *, addr,
         * Only binding to IP is supported.
         */
        err = -EINVAL;
+       if (addr_len < offsetofend(struct sockaddr, sa_family))
+               return err;
        if (addr->sa_family == AF_INET) {
                if (addr_len < sizeof(struct sockaddr_in))
                        return err;