diff options
| author | Mathias Krause <minipli@googlemail.com> | 2012-08-15 11:31:46 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-02 09:47:06 -0700 |
| commit | 1b917a7e47ff3f86bf55cf22d810b97cc053fac8 (patch) | |
| tree | 3f48f23502f5d2bd74a3d23906be41d1593e5df7 /net | |
| parent | d5d3ca708a08caa3a55531b6b781edcb0f64724d (diff) | |
| download | kernel_samsung_tuna-1b917a7e47ff3f86bf55cf22d810b97cc053fac8.zip kernel_samsung_tuna-1b917a7e47ff3f86bf55cf22d810b97cc053fac8.tar.gz kernel_samsung_tuna-1b917a7e47ff3f86bf55cf22d810b97cc053fac8.tar.bz2 | |
Bluetooth: HCI - Fix info leak in getsockopt(HCI_FILTER)
[ Upstream commit e15ca9a0ef9a86f0477530b0f44a725d67f889ee ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_sock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 295e4a8..2dddaa3 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -644,6 +644,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname, char { 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); |