| From | Jiri Slaby <> | Subject | [PATCH 3.12 089/123] ethtool: Use kcalloc instead of kmalloc for ethtool_get_strings | Date | Wed, 28 Oct 2015 14:53:20 +0100 |
| |
From: Joe Perches <joe@perches.com>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
[ 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> --- net/core/ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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; -- 2.6.2
|