| From 8d03e971cf403305217b8e62db3a2e5ad2d6263f Mon Sep 17 00:00:00 2001 |
| From: Filip Palian <s3810@pjwstk.edu.pl> |
| Date: Thu, 12 May 2011 19:32:46 +0200 |
| Subject: Bluetooth: l2cap and rfcomm: fix 1 byte infoleak to userspace. |
| |
| From: Filip Palian <s3810@pjwstk.edu.pl> |
| |
| commit 8d03e971cf403305217b8e62db3a2e5ad2d6263f upstream. |
| |
| Structures "l2cap_conninfo" and "rfcomm_conninfo" have one padding |
| byte each. This byte in "cinfo" is copied to userspace uninitialized. |
| |
| Signed-off-by: Filip Palian <filip.palian@pjwstk.edu.pl> |
| Acked-by: Marcel Holtmann <marcel@holtmann.org> |
| Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| net/bluetooth/l2cap.c | 1 + |
| net/bluetooth/rfcomm/sock.c | 1 + |
| 2 files changed, 2 insertions(+) |
| |
| --- a/net/bluetooth/l2cap.c |
| +++ b/net/bluetooth/l2cap.c |
| @@ -1892,6 +1892,7 @@ static int l2cap_sock_getsockopt_old(str |
| break; |
| } |
| |
| + memset(&cinfo, 0, sizeof(cinfo)); |
| cinfo.hci_handle = l2cap_pi(sk)->conn->hcon->handle; |
| memcpy(cinfo.dev_class, l2cap_pi(sk)->conn->hcon->dev_class, 3); |
| |
| --- a/net/bluetooth/rfcomm/sock.c |
| +++ b/net/bluetooth/rfcomm/sock.c |
| @@ -879,6 +879,7 @@ static int rfcomm_sock_getsockopt_old(st |
| |
| l2cap_sk = rfcomm_pi(sk)->dlc->session->sock->sk; |
| |
| + memset(&cinfo, 0, sizeof(cinfo)); |
| cinfo.hci_handle = l2cap_pi(l2cap_sk)->conn->hcon->handle; |
| memcpy(cinfo.dev_class, l2cap_pi(l2cap_sk)->conn->hcon->dev_class, 3); |
| |