diff options
| author | Joe Perches <joe@perches.com> | 2015-10-14 01:09:40 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-10-28 16:38:16 +0100 |
| commit | c8573a21f501eeb5563be05e5ed9dfa7ae71a4ca (patch) | |
| tree | 6783600e0dfd898a29abb2a4a9c4059de13e81c1 /net/core | |
| parent | b6bc676d553f9e337d92e6fd3e3b0c0449a3e986 (diff) | |
| download | lwn-c8573a21f501eeb5563be05e5ed9dfa7ae71a4ca.tar.gz lwn-c8573a21f501eeb5563be05e5ed9dfa7ae71a4ca.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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'net/core')
| -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 78e9d9223e40..944c60ce15d8 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -1077,7 +1077,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; |