summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDan Rosenberg <drosenberg@vsecurity.com>2010-09-15 11:43:04 +0000
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-01-06 18:07:58 -0500
commit77a8dd404ee1eee8bb5c2a9c8b83b5df2a0624d4 (patch)
treea73f28d29639a6833f63a1ea3a2042ace9213c7c /drivers/net
parentbbf2a842aabff85f810a1571f8598d554690877f (diff)
downloadlinux-stable-77a8dd404ee1eee8bb5c2a9c8b83b5df2a0624d4.tar.gz
linux-stable-77a8dd404ee1eee8bb5c2a9c8b83b5df2a0624d4.tar.bz2
linux-stable-77a8dd404ee1eee8bb5c2a9c8b83b5df2a0624d4.zip
drivers/net/eql.c: prevent reading uninitialized stack memory
commit 44467187dc22fdd33a1a06ea0ba86ce20be3fe3c upstream. Fixed formatting (tabs and line breaks). The EQL_GETMASTRCFG device ioctl allows unprivileged users to read 16 bytes of uninitialized stack memory, because the "master_name" member of the master_config_t struct declared on the stack in eql_g_master_cfg() 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> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/eql.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index b34a2ddeef4c..a8b982d736f2 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -555,6 +555,8 @@ static int eql_g_master_cfg(struct net_device *dev, master_config_t __user *mcp)
equalizer_t *eql;
master_config_t mc;
+ memset(&mc, 0, sizeof(master_config_t));
+
if (eql_is_master(dev)) {
eql = netdev_priv(dev);
mc.max_slaves = eql->max_slaves;