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

Commit e15ca9a0 authored by Mathias Krause's avatar Mathias Krause Committed by David S. Miller
Browse files

Bluetooth: HCI - Fix info leak in getsockopt(HCI_FILTER) 



The HCI code fails to initialize the two padding bytes of struct
hci_ufilter before copying it to userland -- that for leaking two
bytes kernel stack. Add an explicit memset(0) before filling the
structure to avoid the info leak.

Signed-off-by: default avatarMathias Krause <minipli@googlemail.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: Johan Hedberg <johan.hedberg@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3c0c5cfd

net/bluetooth/hci_sock.c

+1 −0
Original line number Diff line number Diff line
@@ -1009,6 +1009,7 @@ static int hci_sock_getsockopt(struct socket *sock, int level, int optname, 
		{

			struct hci_filter *f = &hci_pi(sk)->filter;



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

			uf.type_mask = f->type_mask;

			uf.opcode    = f->opcode;

			uf.event_mask[0] = *((u32 *) f->event_mask + 0);