Commit 30b7483f authored by David S. Miller's avatar David S. Miller

Merge branch 'net-Use-strlcpy-for-ethtool-get_strings'

Florian Fainelli says:

====================
net: Use strlcpy() for ethtool::get_strings

After turning on KASAN on one of my systems, I started getting lots of out of
bounds errors while fetching a given port's statistics, and indeed using
memcpy() is unsafe for copying strings which have not been declared as an array
of ETH_GSTRING_LEN bytes, so let's use strlcpy() instead. This allows the best
of both worlds: we still keep the efficient memory usage of variably sized
strings, but we don't copy more than we need to.

Changes in v2:
- dropped the 3 other patches that were not necessary
- use strlcpy() instead of strncpy()
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ce380619 8a17eefa
...@@ -814,7 +814,7 @@ void b53_get_strings(struct dsa_switch *ds, int port, uint8_t *data) ...@@ -814,7 +814,7 @@ void b53_get_strings(struct dsa_switch *ds, int port, uint8_t *data)
unsigned int i; unsigned int i;
for (i = 0; i < mib_size; i++) for (i = 0; i < mib_size; i++)
memcpy(data + i * ETH_GSTRING_LEN, strlcpy(data + i * ETH_GSTRING_LEN,
mibs[i].name, ETH_GSTRING_LEN); mibs[i].name, ETH_GSTRING_LEN);
} }
EXPORT_SYMBOL(b53_get_strings); EXPORT_SYMBOL(b53_get_strings);
......
...@@ -341,7 +341,7 @@ void bcm_phy_get_strings(struct phy_device *phydev, u8 *data) ...@@ -341,7 +341,7 @@ void bcm_phy_get_strings(struct phy_device *phydev, u8 *data)
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(bcm_phy_hw_stats); i++) for (i = 0; i < ARRAY_SIZE(bcm_phy_hw_stats); i++)
memcpy(data + i * ETH_GSTRING_LEN, strlcpy(data + i * ETH_GSTRING_LEN,
bcm_phy_hw_stats[i].string, ETH_GSTRING_LEN); bcm_phy_hw_stats[i].string, ETH_GSTRING_LEN);
} }
EXPORT_SYMBOL_GPL(bcm_phy_get_strings); EXPORT_SYMBOL_GPL(bcm_phy_get_strings);
......
...@@ -1452,7 +1452,7 @@ static void marvell_get_strings(struct phy_device *phydev, u8 *data) ...@@ -1452,7 +1452,7 @@ static void marvell_get_strings(struct phy_device *phydev, u8 *data)
int i; int i;
for (i = 0; i < ARRAY_SIZE(marvell_hw_stats); i++) { for (i = 0; i < ARRAY_SIZE(marvell_hw_stats); i++) {
memcpy(data + i * ETH_GSTRING_LEN, strlcpy(data + i * ETH_GSTRING_LEN,
marvell_hw_stats[i].string, ETH_GSTRING_LEN); marvell_hw_stats[i].string, ETH_GSTRING_LEN);
} }
} }
......
...@@ -664,7 +664,7 @@ static void kszphy_get_strings(struct phy_device *phydev, u8 *data) ...@@ -664,7 +664,7 @@ static void kszphy_get_strings(struct phy_device *phydev, u8 *data)
int i; int i;
for (i = 0; i < ARRAY_SIZE(kszphy_hw_stats); i++) { for (i = 0; i < ARRAY_SIZE(kszphy_hw_stats); i++) {
memcpy(data + i * ETH_GSTRING_LEN, strlcpy(data + i * ETH_GSTRING_LEN,
kszphy_hw_stats[i].string, ETH_GSTRING_LEN); kszphy_hw_stats[i].string, ETH_GSTRING_LEN);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment