Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-04 12:16:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ethtool: Use kcalloc instead of kmalloc for ethtool_get_strings

Browse Source 
[ Upstream commit 077cb37fcf ]

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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
(cherry picked from commit 68c3e59aa9)

Signed-off-by: Willy Tarreau <w@1wt.eu>
This commit is contained in:
Joe Perches 2015-10-14 01:09:40 -07:00 committed by Willy Tarreau
parent 53bf8cef1e
commit 62611261b1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/core/ethtool.c
View File

@ -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)
return -ENOMEM;