]> git.hungrycats.org Git - linux/commitdiff
Bluetooth: sco: fix information leak to userspace
authorVasiliy Kulikov <segoon@openwall.com>
Mon, 14 Feb 2011 10:54:26 +0000 (13:54 +0300)
committerAndi Kleen <ak@linux.intel.com>
Thu, 28 Apr 2011 15:20:55 +0000 (08:20 -0700)
commit c4c896e1471aec3b004a693c689f60be3b17ac86 upstream.

struct sco_conninfo has one padding byte in the end.  Local variable
cinfo of type sco_conninfo is copied to userspace with this uninizialized
one byte, leading to old stack contents leak.

Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
net/bluetooth/sco.c

index d0927d1fdadaba4887dbac40064c4328541b9b00..f3f8d4cd55b5e6db0c0c7a5847600ababf759492 100644 (file)
@@ -700,6 +700,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname, char __user
                        break;
                }
 
+               memset(&cinfo, 0, sizeof(cinfo));
                cinfo.hci_handle = sco_pi(sk)->conn->hcon->handle;
                memcpy(cinfo.dev_class, sco_pi(sk)->conn->hcon->dev_class, 3);