diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:26:03 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:26:03 +0800 |
| commit | 8fa6d2e1fe937af9dbacb5aad8c43dbb67466fa0 (patch) | |
| tree | 53b1cbcaec14e50f491e1cb1f20106c7a15c70e8 /net/core/ethtool.c | |
| parent | 74bc3fe5f5fbb50d63fd002ce240cc7bca236db1 (diff) | |
| parent | f90ae1b62bedd8b57966a7be68855f2d43170db6 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.01-android
Diffstat (limited to 'net/core/ethtool.c')
| -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 06dfb293e5aa..14bb1583947e 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -1257,7 +1257,7 @@ static int ethtool_get_strings(struct net_device *dev, void __user *useraddr) gstrings.len = ret; - data = kmalloc(gstrings.len * ETH_GSTRING_LEN, GFP_USER); + data = kcalloc(gstrings.len, ETH_GSTRING_LEN, GFP_USER); if (!data) return -ENOMEM; |