commit: b7c7d01aaed1f71d9afe815a569f0a81465a1744 From: Eugene Teo <[email protected]> Date: Mon, 24 Jan 2011 21:05:17 -0800 Subject: [PATCH] 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: [email protected] Signed-off-by: Eugene Teo <[email protected]> Signed-off-by: David S. Miller <[email protected]> --- net/core/ethtool.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 1774178..ff23029 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; _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
