From 62611261b1f4e93561adcedc919473481cebc2f4 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Wed, 14 Oct 2015 01:09:40 -0700 Subject: [PATCH] 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 Acked-by: Ben Hutchings Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings (cherry picked from commit 68c3e59aa9cdf2d8870d8fbe4f37b1a509d0abeb) Signed-off-by: Willy Tarreau --- 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 f9e7179dedf97..ed17505925479 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -794,7 +794,7 @@ static int ethtool_get_strings(struct net_device *dev, void __user *useraddr) } } - data = kmalloc(gstrings.len * ETH_GSTRING_LEN, GFP_USER); + data = kcalloc(gstrings.len, ETH_GSTRING_LEN, GFP_USER); if (!data) return -ENOMEM; -- 2.47.2