39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 1f7d62fdd8dd974808c4c4c5dcc35b908d92cb3b Mon Sep 17 00:00:00 2001
|
|
From: Florian Fainelli <f.fainelli@gmail.com>
|
|
Date: Fri, 2 Mar 2018 15:08:38 -0800
|
|
Subject: [PATCH] net: phy: micrel: Use strlcpy() for ethtool::get_strings
|
|
|
|
commit 55f53567afe5f0cd2fd9e006b174c08c31c466f8 upstream.
|
|
|
|
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>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/net/phy/micrel.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
|
|
index 5be7fc354e33..ef5e5b621ec5 100644
|
|
--- a/drivers/net/phy/micrel.c
|
|
+++ b/drivers/net/phy/micrel.c
|
|
@@ -674,8 +674,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);
|
|
}
|
|
}
|
|
|
|
--
|
|
2.29.2
|
|
|