diff options
| author | Joe Perches <joe@perches.com> | 2015-10-14 01:09:40 -0700 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2016-08-26 20:45:13 +0200 |
| commit | 74b84d530a0cd387fe21e924c5091ecb16eea0a4 (patch) | |
| tree | e648a1cac8abd1d0a1eb4a476e72685068da834c | |
| parent | 03aabd791f12ca06882875b257087d3dd12d8e98 (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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stefan Guendhoer <stefan@guendhoer.com>
| -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 ce91766ee..213b61255 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -1066,7 +1066,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; |