diff options
| author | Joe Perches <joe@perches.com> | 2015-10-14 10:09:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-15 04:00:20 +0200 |
| commit | 077cb37fcf6f00a45f375161200b5ee0cd4e937b (patch) | |
| tree | 28e5684447aa0ca07b63a2c66e3bb8f29e7139f5 | |
| parent | Merge tag 'mac80211-for-davem-2015-10-13' of git://git.kernel.org/pub/scm/lin... (diff) | |
| download | linux-077cb37fcf6f00a45f375161200b5ee0cd4e937b.tar.xz linux-077cb37fcf6f00a45f375161200b5ee0cd4e937b.zip | |
ethtool: Use kcalloc instead of kmalloc for ethtool_get_strings
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>
| -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 b495ab1797fa..29edf74846fc 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -1284,7 +1284,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; |