Bluetooth: Add sockaddr length checks before accessing sa_family in bind and connect...

Verify that the caller-provided sockaddr structure is large enough to
contain the sa_family field, before accessing it in bind() and connect()
handlers of the Bluetooth sockets. Since neither syscall enforces a minimum
size of the corresponding memory region, very short sockaddrs (zero or one
byte long) result in operating on uninitialized memory while referencing
sa_family.

Signed-off-by: Mateusz Jurczyk <mjurczyk@google.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 507b80d59dec4fd3b0eb3c50ed1cd95a78adfcb7..67a8642f57ea7c8ceadc1d379019ea6135877068 100644 (file)
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -87,7 +87,8 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
 
        BT_DBG("sk %p", sk);
 
-       if (!addr || addr->sa_family != AF_BLUETOOTH)
+       if (!addr || alen < offsetofend(struct sockaddr, sa_family) ||
+           addr->sa_family != AF_BLUETOOTH)
                return -EINVAL;
 
        memset(&la, 0, sizeof(la));
@@ -181,7 +182,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,
 
        BT_DBG("sk %p", sk);
 
-       if (!addr || alen < sizeof(addr->sa_family) ||
+       if (!addr || alen < offsetofend(struct sockaddr, sa_family) ||
            addr->sa_family != AF_BLUETOOTH)
                return -EINVAL;
 

diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index ac3c650cb234f9985ddf0b54924db9000c4586c3..2025b45a8bf8f1aac530385c331983514b44b337 100644 (file)
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -339,7 +339,8 @@ static int rfcomm_sock_bind(struct socket *sock, struct sockaddr *addr, int addr
        struct sock *sk = sock->sk;
        int len, err = 0;
 
-       if (!addr || addr->sa_family != AF_BLUETOOTH)
+       if (!addr || addr_len < offsetofend(struct sockaddr, sa_family) ||
+           addr->sa_family != AF_BLUETOOTH)
                return -EINVAL;
 
        memset(&sa, 0, sizeof(sa));

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 728e0c8dc8e74ccb134b8ed1d493ea8ee49bf49b..795e920a3281939f8f84e76f9f3fc6161146a558 100644 (file)
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -524,10 +524,8 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr,
 
        BT_DBG("sk %p %pMR", sk, &sa->sco_bdaddr);
 
-       if (!addr || addr->sa_family != AF_BLUETOOTH)
-               return -EINVAL;
-
-       if (addr_len < sizeof(struct sockaddr_sco))
+       if (!addr || addr_len < sizeof(struct sockaddr_sco) ||
+           addr->sa_family != AF_BLUETOOTH)
                return -EINVAL;
 
        lock_sock(sk);