summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/hso.c
diff options
context:
space:
mode:
authorDan Rosenberg <drosenberg@vsecurity.com>2010-09-15 13:43:28 +0200
committerDavid S. Miller <davem@davemloft.net>2010-09-17 06:54:59 +0200
commit7011e660938fc44ed86319c18a5954e95a82ab3e (patch)
treeae74316fe3fe11113a1fa0bf150fc8a454143f5b /drivers/net/usb/hso.c
parentxfrm: dont assume rcu_read_lock in xfrm_output_one() (diff)
downloadlinux-7011e660938fc44ed86319c18a5954e95a82ab3e.tar.xz
linux-7011e660938fc44ed86319c18a5954e95a82ab3e.zip
drivers/net/usb/hso.c: prevent reading uninitialized memory
Fixed formatting (tabs and line breaks). The TIOCGICOUNT device ioctl allows unprivileged users to read uninitialized stack memory, because the "reserved" member of the serial_icounter_struct struct declared on the stack in hso_get_count() is not altered or zeroed before being copied back to the user. This patch takes care of it. Signed-off-by: Dan Rosenberg <dan.j.rosenberg@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/hso.c')
-rw-r--r--drivers/net/usb/hso.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 6efca66b8766..1cd752f9a6e1 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -1652,6 +1652,8 @@ static int hso_get_count(struct hso_serial *serial,
struct uart_icount cnow;
struct hso_tiocmget *tiocmget = serial->tiocmget;
+ memset(&icount, 0, sizeof(struct serial_icounter_struct));
+
if (!tiocmget)
return -ENOENT;
spin_lock_irq(&serial->serial_lock);