diff options
| author | Joe Perches <joe@perches.com> | 2015-10-14 01:09:40 -0700 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-11-13 13:17:15 -0500 |
| commit | e2fd4b16c7d495b1120dff97bb2de2a7079c53d0 (patch) | |
| tree | d566a9f1dffd94d870ab0de65125386c1c672751 /net | |
| parent | d2c7ba2960397cd255c66e57cf3e8ac2ab81b94d (diff) | |
| download | lwn-e2fd4b16c7d495b1120dff97bb2de2a7079c53d0.tar.gz lwn-e2fd4b16c7d495b1120dff97bb2de2a7079c53d0.zip | |
ethtool: Use kcalloc instead of kmalloc for ethtool_get_strings
[ Upstream commit 077cb37fcf6f00a45f375161200b5ee0cd4e937b ]
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: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 06dfb293e5aa..14bb1583947e 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -1257,7 +1257,7 @@ static int ethtool_get_strings(struct net_device *dev, void __user *useraddr) gstrings.len = ret; - data = kmalloc(gstrings.len * ETH_GSTRING_LEN, GFP_USER); + data = kcalloc(gstrings.len, ETH_GSTRING_LEN, GFP_USER); if (!data) return -ENOMEM; |