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: v2.6.37.1~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b33c4a2720e314ac4c23589a301b378c13a6606;p=thirdparty%2Fkernel%2Fstable.git

net: clear heap allocation for ethtool_get_regs()

commit b7c7d01aaed1f71d9afe815a569f0a81465a1744 upstream.

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

Signed-off-by: Eugene Teo <eugeneteo@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 956a9f4971cbc..1c6c3ac4c9608 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;