summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorKees Cook <kees.cook@canonical.com>2010-10-11 12:23:25 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-21 12:43:20 -0700
commit487a1f7338ff740bde0d15f97c44b7b8029cc9c7 (patch)
tree2752541fccc815c1bb46bdeb999906c351e118f6 /net
parent217e4b61e6b5e14f950b5353ba261d9cd8142186 (diff)
net: clear heap allocations for privileged ethtool actions
[ Upstream commit b00916b189d13a615ff05c9242201135992fcda3 ] Several other ethtool functions leave heap uncleared (potentially) by drivers. Some interfaces appear safe (eeprom, etc), in that the sizes are well controlled. In some situations (e.g. unchecked error conditions), the heap will remain unchanged in areas before copying back to userspace. Note that these are less of an issue since these all require CAP_NET_ADMIN. Cc: stable@kernel.org Signed-off-by: Kees Cook <kees.cook@canonical.com> Acked-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
-rw-r--r--net/core/ethtool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index ed2fb75e0d00..310ba1c28083 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -304,7 +304,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)
if (regs.len > reglen)
regs.len = reglen;
- regbuf = kmalloc(reglen, GFP_USER);
+ regbuf = kzalloc(reglen, GFP_USER);
if (!regbuf)
return -ENOMEM;