summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2012-08-15 11:31:46 +0000
committerDavid S. Miller <davem@davemloft.net>2012-08-15 21:36:30 -0700
commite15ca9a0ef9a86f0477530b0f44a725d67f889ee (patch)
treeab24fc2022a7e5c993940ecfb5a3889e4bdc4c24
parent3c0c5cfdcd4d69ffc4b9c0907cec99039f30a50a (diff)
downloadlinux-3.10-e15ca9a0ef9a86f0477530b0f44a725d67f889ee.tar.gz
linux-3.10-e15ca9a0ef9a86f0477530b0f44a725d67f889ee.tar.bz2
linux-3.10-e15ca9a0ef9a86f0477530b0f44a725d67f889ee.zip
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: Mathias 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: David S. Miller <davem@davemloft.net>
-rw-r--r--net/bluetooth/hci_sock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index a7f04de03d7..a27bbc3cd4b 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -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);