aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2010-12-18 15:26:51 +0100
committerWilly Tarreau <w@1wt.eu>2010-12-18 15:26:51 +0100
commitd49e006b1e0ef4f1c80f5e671a49450f5f772358 (patch)
tree638391d8620d341b237304c756b313027d089685
parent7443d41f73a83f37b799acbc0b8bb197cee95151 (diff)
downloadlinux-2.4-d49e006b1e0ef4f1c80f5e671a49450f5f772358.tar.gz
usb: core: fix information leak to userland
Structure usbdevfs_connectinfo is copied to userland with padding byted after "slow" field uninitialized. It leads to leaking of contents of kernel stack memory. Signed-off-by: Vasiliy Kulikov <segooon@gmail.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> (cherry picked from commit 886ccd4520064408ce5876cfe00554ce52ecf4a7) Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r--drivers/usb/devio.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/devio.c b/drivers/usb/devio.c
index 314f84b2306d9a..b2327d6fdf18ba 100644
--- a/drivers/usb/devio.c
+++ b/drivers/usb/devio.c
@@ -717,10 +717,11 @@ static int proc_getdriver(struct dev_state *ps, void *arg)
static int proc_connectinfo(struct dev_state *ps, void *arg)
{
- struct usbdevfs_connectinfo ci;
+ struct usbdevfs_connectinfo ci = {
+ .devnum = ps->dev->devnum,
+ .slow = ps->dev->speed == USB_SPEED_LOW
+ };
- ci.devnum = ps->dev->devnum;
- ci.slow = ps->dev->speed == USB_SPEED_LOW;
if (copy_to_user(arg, &ci, sizeof(ci)))
return -EFAULT;
return 0;