summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hidp
diff options
context:
space:
mode:
authorVasiliy Kulikov <segooon@gmail.com>2010-10-30 18:26:31 +0400
committerGustavo F. Padovan <padovan@profusion.mobi>2010-12-01 21:04:36 -0200
commitd31dbf6e5989b2fd9a30ec5b25436e94f009d6df (patch)
tree5a7ad10f10b50e5b4c2f514d86b94311d17c4450 /net/bluetooth/hidp
parent3185fbd9d7bb166992f072440b3329f58bf2c60a (diff)
downloadop-kernel-dev-d31dbf6e5989b2fd9a30ec5b25436e94f009d6df.zip
op-kernel-dev-d31dbf6e5989b2fd9a30ec5b25436e94f009d6df.tar.gz
Bluetooth: hidp: fix information leak to userland
Structure hidp_conninfo is copied to userland with version, product, vendor and name fields unitialized if both session->input and session->hid are NULL. It leads to leaking of contents of kernel stack memory. Signed-off-by: Vasiliy Kulikov <segooon@gmail.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hidp')
-rw-r--r--net/bluetooth/hidp/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index c0ee8b3..29544c2 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -107,6 +107,7 @@ static void __hidp_unlink_session(struct hidp_session *session)
static void __hidp_copy_session(struct hidp_session *session, struct hidp_conninfo *ci)
{
+ memset(ci, 0, sizeof(*ci));
bacpy(&ci->bdaddr, &session->bdaddr);
ci->flags = session->flags;
@@ -115,7 +116,6 @@ static void __hidp_copy_session(struct hidp_session *session, struct hidp_connin
ci->vendor = 0x0000;
ci->product = 0x0000;
ci->version = 0x0000;
- memset(ci->name, 0, 128);
if (session->input) {
ci->vendor = session->input->id.vendor;
OpenPOWER on IntegriCloud