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

Commit 8d03e971 authored by Filip Palian's avatar Filip Palian Committed by Gustavo Padovan
Browse files

Bluetooth: l2cap and rfcomm: fix 1 byte infoleak to userspace. 



Structures "l2cap_conninfo" and "rfcomm_conninfo" have one padding
byte each. This byte in "cinfo" is copied to userspace uninitialized.

Signed-off-by: default avatarFilip Palian <filip.palian@pjwstk.edu.pl>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 51892dbb

net/bluetooth/l2cap_sock.c

+1 −0
Original line number Diff line number Diff line
@@ -413,6 +413,7 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, char __us 
			break;

		}



		memset(&cinfo, 0, sizeof(cinfo));

		cinfo.hci_handle = chan->conn->hcon->handle;

		memcpy(cinfo.dev_class, chan->conn->hcon->dev_class, 3);

net/bluetooth/rfcomm/sock.c

+1 −0
Original line number Diff line number Diff line
@@ -788,6 +788,7 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u 


		l2cap_sk = rfcomm_pi(sk)->dlc->session->sock->sk;



		memset(&cinfo, 0, sizeof(cinfo));

		cinfo.hci_handle = conn->hcon->handle;

		memcpy(cinfo.dev_class, conn->hcon->dev_class, 3);