commit e3fb592b15602196d38b225dc78aab8d631a5f89
author Vasiliy Kulikov <segoon@openwall.com> Thu Feb 10 20:59:42 2011 +0300
committer Gustavo F. Padovan <padovan@profusion.mobi> Fri Feb 11 15:21:29 2011 -0200
tree e105066cfe0e797fe02d47eae396d934d3c23a18
parent 6d1d4ea4a82f8c17a3ff7c2f677bc3d41ea7484b

Bluetooth: l2cap: fix 1 byte infoleak to userspace

Structure l2cap_options has one padding byte between max_tx and
txwin_size fields.  This byte in "opts" is copied to userspace
uninitialized.

Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

net/bluetooth/l2cap_sock.c

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index adf4169..21f5385 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -392,6 +392,7 @@
 
 	switch (optname) {
 	case L2CAP_OPTIONS:
+		memset(&opts, 0, sizeof(opts));
 		opts.imtu     = l2cap_pi(sk)->imtu;
 		opts.omtu     = l2cap_pi(sk)->omtu;
 		opts.flush_to = l2cap_pi(sk)->flush_to;