Skip to content

Commit 077cb37

Browse files
JoePerchesdavem330
authored andcommitted
ethtool: Use kcalloc instead of kmalloc for ethtool_get_strings
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: Joe Perches <joe@perches.com> Acked-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent ef41a2c commit 077cb37

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/core/ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1284,7 +1284,7 @@ static int ethtool_get_strings(struct net_device *dev, void __user *useraddr)
12841284

12851285
gstrings.len = ret;
12861286

1287-
data = kmalloc(gstrings.len * ETH_GSTRING_LEN, GFP_USER);
1287+
data = kcalloc(gstrings.len, ETH_GSTRING_LEN, GFP_USER);
12881288
if (!data)
12891289
return -ENOMEM;
12901290

0 commit comments

Comments
 (0)