Commit b7c7d01a authored Jan 24, 2011 by Eugene Teo Committed by David S. Miller Jan 24, 2011

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>

parent d80bc0fd

net/core/ethtool.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;