diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2018-03-02 15:08:38 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-06 11:12:39 -0500 |
| commit | 55f53567afe5f0cd2fd9e006b174c08c31c466f8 (patch) | |
| tree | 9cfdb5db2e7148f6a404e75f229af4156660d0de /drivers/net/phy | |
| parent | net: phy: marvell: Use strlcpy() for ethtool::get_strings (diff) | |
| download | linux-dev-55f53567afe5f0cd2fd9e006b174c08c31c466f8.tar.xz linux-dev-55f53567afe5f0cd2fd9e006b174c08c31c466f8.zip | |
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: 2b2427d06426 ("phy: micrel: Add ethtool statistics counters")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/micrel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 0f45310300f6..49be85afbea9 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -664,8 +664,8 @@ static void kszphy_get_strings(struct phy_device *phydev, u8 *data) int i; for (i = 0; i < ARRAY_SIZE(kszphy_hw_stats); i++) { - memcpy(data + i * ETH_GSTRING_LEN, - kszphy_hw_stats[i].string, ETH_GSTRING_LEN); + strlcpy(data + i * ETH_GSTRING_LEN, + kszphy_hw_stats[i].string, ETH_GSTRING_LEN); } } |