diff options
| author | Joe Perches <joe@perches.com> | 2015-10-14 01:09:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 09:45:55 +0900 |
| commit | 8c7a0e4993937c47b7584ce98e67dede323f29f6 (patch) | |
| tree | 6a1956fbc0673c409fc5e5ed30880290cf762c74 | |
| parent | 321e117944dd09975ec42bd3da57894fe38d893a (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>
| -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 30071dec287a..0b39ab6f7675 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -1080,7 +1080,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; |