summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Rosenberg <dan.j.rosenberg@gmail.com>2010-09-17 09:34:26 +0400
committerDavid S. Miller <davem@davemloft.net>2010-09-17 09:34:26 +0400
commit0c796f91a518480fd6696ba2affed1167e840823 (patch)
tree5550fb0a75bc5a442a7519b1cf4e2d9bca485a42
parentcd13539b8bc9ae884e6d8d9374c594adff4304e4 (diff)
downloadlinux-0c796f91a518480fd6696ba2affed1167e840823.tar.xz
drivers/net/tulip/de4x5.c: fix union member name in DE4X5_GET_REG ioctl
This was previously reported as a security issue due to leakage of uninitialized stack memory. Jeff Mahoney pointed out that this is incorrect since the copied data is from a union (rather than a struct). Therefore, this patch is only under consideration for the sake of correctness, and is not security relevant. Signed-off-by: Dan Rosenberg <dan.j.rosenberg@gmail.com> Acked-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/tulip/de4x5.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 4f7503063446..1d9fef74b39b 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -5474,7 +5474,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
tmp.lval[6] = inl(DE4X5_STRR); j+=4;
tmp.lval[7] = inl(DE4X5_SIGR); j+=4;
ioc->len = j;
- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
+ if (copy_to_user(ioc->data, tmp.lval, ioc->len)) return -EFAULT;
break;
#define DE4X5_DUMP 0x0f /* Dump the DE4X5 Status */