Commit 55f53567 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: phy: micrel: Use strlcpy() for ethtool::get_strings

Our statistics strings are allocated at initialization without being
bound to a specific size, yet, we would copy ETH_GSTRING_LEN bytes using
memcpy() which would create out of bounds accesses, this was flagged by
KASAN. Replace this with strlcpy() to make sure we are bound the source
buffer size and we also always NUL-terminate strings.

Fixes: 2b2427d0 ("phy: micrel: Add ethtool statistics counters")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 98409b2b
...@@ -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