Commit 62611261 authored by Joe Perches's avatar Joe Perches Committed by Willy Tarreau

ethtool: Use kcalloc instead of kmalloc for ethtool_get_strings

[ Upstream commit 077cb37f ]

It seems that kernel memory can leak into userspace by a
kmalloc, ethtool_get_strings, then copy_to_user sequence.

Avoid this by using kcalloc to zero fill the copied buffer.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
(cherry picked from commit 68c3e59a)
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
parent 53bf8cef
...@@ -794,7 +794,7 @@ static int ethtool_get_strings(struct net_device *dev, void __user *useraddr) ...@@ -794,7 +794,7 @@ static int ethtool_get_strings(struct net_device *dev, void __user *useraddr)
} }
} }
data = kmalloc(gstrings.len * ETH_GSTRING_LEN, GFP_USER); data = kcalloc(gstrings.len, ETH_GSTRING_LEN, GFP_USER);
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment