git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ethtool: Use kcalloc instead of kmalloc for ethtool_get_strings
[pandora-kernel.git]
/
net
/
core
/
ethtool.c
diff --git
a/net/core/ethtool.c
b/net/core/ethtool.c
index
f444817
..
f31698a
100644
(file)
--- a/
net/core/ethtool.c
+++ b/
net/core/ethtool.c
@@
-1359,7
+1359,7
@@
static int ethtool_get_strings(struct net_device *dev, void __user *useraddr)
gstrings.len = ret;
gstrings.len = ret;
- data = k
malloc(gstrings.len *
ETH_GSTRING_LEN, GFP_USER);
+ data = k
calloc(gstrings.len,
ETH_GSTRING_LEN, GFP_USER);
if (!data)
return -ENOMEM;
if (!data)
return -ENOMEM;
@@
-1549,6
+1549,8
@@
static noinline_for_stack int ethtool_flash_device(struct net_device *dev,
if (!dev->ethtool_ops->flash_device)
return -EOPNOTSUPP;
if (!dev->ethtool_ops->flash_device)
return -EOPNOTSUPP;
+ efl.data[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0;
+
return dev->ethtool_ops->flash_device(dev, &efl);
}
return dev->ethtool_ops->flash_device(dev, &efl);
}
@@
-1670,6
+1672,7
@@
int dev_ethtool(struct net *net, struct ifreq *ifr)
case ETHTOOL_GRXCSUM:
case ETHTOOL_GTXCSUM:
case ETHTOOL_GSG:
case ETHTOOL_GRXCSUM:
case ETHTOOL_GTXCSUM:
case ETHTOOL_GSG:
+ case ETHTOOL_GSSET_INFO:
case ETHTOOL_GSTRINGS:
case ETHTOOL_GTSO:
case ETHTOOL_GPERMADDR:
case ETHTOOL_GSTRINGS:
case ETHTOOL_GTSO:
case ETHTOOL_GPERMADDR: