From: Eugene Teo <eugeneteo@kernel.org>
Date: Tue, 25 Jan 2011 05:05:17 +0000 (-0800)
Subject: net: clear heap allocation for ethtool_get_regs()
X-Git-Tag: firefly_0821_release~7613^2~2412^2~120
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b7c7d01aaed1f71d9afe815a569f0a81465a1744;p=firefly-linux-kernel-4.4.55.git

net: clear heap allocation for ethtool_get_regs()

There is a conflict between commit b00916b1 and a77f5db3. This patch resolves
the conflict by clearing the heap allocation in ethtool_get_regs().

Cc: stable@kernel.org
Signed-off-by: Eugene Teo <eugeneteo@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 17741782a345..ff2302910b5e 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -817,7 +817,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)
 	if (regs.len > reglen)
 		regs.len = reglen;
 
-	regbuf = vmalloc(reglen);
+	regbuf = vzalloc(reglen);
 	if (!regbuf)
 		return -ENOMEM;