aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Rosenberg <drosenberg@vsecurity.com>2010-09-15 11:43:12 +0000
committerDavid S. Miller <davem@davemloft.net>2010-09-16 21:55:00 -0700
commit49c37c0334a9b85d30ab3d6b5d1acb05ef2ef6de (patch)
tree10bc5cacbbe2aefc83eb9d54a6698aaef65c393a
parent44467187dc22fdd33a1a06ea0ba86ce20be3fe3c (diff)
downloadmrst-s0i3-test-49c37c0334a9b85d30ab3d6b5d1acb05ef2ef6de.tar.gz
mrst-s0i3-test-49c37c0334a9b85d30ab3d6b5d1acb05ef2ef6de.tar.xz
mrst-s0i3-test-49c37c0334a9b85d30ab3d6b5d1acb05ef2ef6de.zip
drivers/net/cxgb3/cxgb3_main.c: prevent reading uninitialized stack memory
Fixed formatting (tabs and line breaks). The CHELSIO_GET_QSET_NUM device ioctl allows unprivileged users to read 4 bytes of uninitialized stack memory, because the "addr" member of the ch_reg struct declared on the stack in cxgb_extension_ioctl() 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>
-rw-r--r--drivers/net/cxgb3/cxgb3_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index ad19585d960..f208712c0b9 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -2296,6 +2296,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
case CHELSIO_GET_QSET_NUM:{
struct ch_reg edata;
+ memset(&edata, 0, sizeof(struct ch_reg));
+
edata.cmd = CHELSIO_GET_QSET_NUM;
edata.val = pi->nqsets;
if (copy_to_user(useraddr, &edata, sizeof(edata)))