2011-02-10 17:59:42

by Vasily Kulikov

[permalink] [raw]
Subject: [PATCH] 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 <[email protected]>
---
Compile tested only.

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

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;
--
1.7.0.4


2011-02-10 18:11:33

by Gustavo Padovan

[permalink] [raw]
Subject: Re: [PATCH] bluetooth: l2cap: fix 1 byte infoleak to userspace

Hi Vasiliy,

* Vasiliy Kulikov <[email protected]> [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 <[email protected]>
> ---
> Compile tested only.
>
> net/bluetooth/l2cap_sock.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)

Patch has been applied, thanks.

--
Gustavo F. Padovan
http://profusion.mobi