net: clear heap allocation for ethtool_get_regs()
authorEugene Teo <eugeneteo@kernel.org>
Tue, 25 Jan 2011 05:05:17 +0000 (21:05 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 25 Jan 2011 05:05:17 +0000 (21:05 -0800)
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>
net/core/ethtool.c

index 17741782a345f78328a881da5887f6e81834f5b6..ff2302910b5eb936c7618c24477c018cfdcd159f 100644 (file)
@@ -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;