diff options
| author | Eugene Teo <eugeneteo@kernel.org> | 2011-01-24 21:05:17 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 15:14:58 -0800 |
| commit | 5b33c4a2720e314ac4c23589a301b378c13a6606 (patch) | |
| tree | 55af33686b88fa1fbd4bbc203766792b5279e54b /net | |
| parent | 3e3742bc3d042533355fdc13dcec17deb5b584fa (diff) | |
net: clear heap allocation for ethtool_get_regs()
commit b7c7d01aaed1f71d9afe815a569f0a81465a1744 upstream.
There is a conflict between commit b00916b1 and a77f5db3. This patch resolves
the conflict by clearing the heap allocation in ethtool_get_regs().
Signed-off-by: Eugene Teo <eugeneteo@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to '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 956a9f4971c..1c6c3ac4c96 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; |