diff options
| author | Eugene Teo <eugeneteo@kernel.org> | 2011-01-25 06:05:17 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-25 06:05:17 +0100 |
| commit | b7c7d01aaed1f71d9afe815a569f0a81465a1744 (patch) | |
| tree | 69d2d061d327713f3c1acc574507edbbb4a5ccb6 | |
| parent | ipv6: Always clone offlink routes. (diff) | |
| download | linux-b7c7d01aaed1f71d9afe815a569f0a81465a1744.tar.xz linux-b7c7d01aaed1f71d9afe815a569f0a81465a1744.zip | |
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>
| -rw-r--r-- | 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 17741782a345..ff2302910b5e 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; |