diff mbox

bluetooth: l2cap: fix 1 byte infoleak to userspace

Message ID 1297360783-21452-1-git-send-email-segoon@openwall.com
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Vasiliy Kulikov Feb. 10, 2011, 5:59 p.m. UTC 
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>
---
 Compile tested only.

 net/bluetooth/l2cap_sock.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Gustavo F. Padovan Feb. 10, 2011, 6:11 p.m. UTC | #1 
Hi Vasiliy,

* Vasiliy Kulikov <segoon@openwall.com> [2011-02-10 20:59:42 +0300]:

> 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>
> ---
>  Compile tested only.
> 
>  net/bluetooth/l2cap_sock.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Patch has been applied, thanks.
diff mbox

Patch

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 @@  static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, char __us
 
 	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;