diff options
| author | Joe Perches <joe@perches.com> | 2015-10-14 01:09:40 -0700 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2015-12-06 00:49:16 +0100 |
| commit | 62611261b1f4e93561adcedc919473481cebc2f4 (patch) | |
| tree | ed2af1f9c7f3e41e170fd84cb99417bd31b58b65 | |
| parent | 53bf8cef1e93ab5b356bb3122d2312fdfc74d979 (diff) | |
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: Ben Hutchings <ben@decadent.org.uk>
(cherry picked from commit 68c3e59aa9cdf2d8870d8fbe4f37b1a509d0abeb)
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -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 f9e7179dedf9..ed1750592547 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -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; |