Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2ecfa76 authored by Mateusz Jurczyk's avatar Mateusz Jurczyk Committed by Marcel Holtmann
Browse files

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



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: default avatarMateusz Jurczyk <mjurczyk@google.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 29e2dd0d

net/bluetooth/l2cap_sock.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

net/bluetooth/rfcomm/sock.c

+2 −1
Original line number Diff line number Diff line
@@ -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));

net/bluetooth/sco.c

+2 −4
Original line number Diff line number Diff line
@@ -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);