net: clear heap allocation for ethtool_get_regs()

There is a conflict between commit b00916b and a77f5db. 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>
git-mirror · Jan 25, 2011 · b7c7d01 · b7c7d01
1 parent d80bc0f
commit b7c7d01
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;