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

davem330 · davem330 · commit 30b7483f35f2 · 2018-03-06T11:12:40.000-05:00
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: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
@@ -814,8 +814,8 @@ void b53_get_strings(struct dsa_switch *ds, int port, uint8_t *data)
 	unsigned int i;
 
 	for (i = 0; i < mib_size; i++)
-		memcpy(data + i * ETH_GSTRING_LEN,
-		       mibs[i].name, ETH_GSTRING_LEN);
+		strlcpy(data + i * ETH_GSTRING_LEN,
+			mibs[i].name, ETH_GSTRING_LEN);
 }
 EXPORT_SYMBOL(b53_get_strings);
 
diff --git a/drivers/net/phy/bcm-phy-lib.c b/drivers/net/phy/bcm-phy-lib.c
@@ -341,8 +341,8 @@ void bcm_phy_get_strings(struct phy_device *phydev, u8 *data)
 	unsigned int i;
 
 	for (i = 0; i < ARRAY_SIZE(bcm_phy_hw_stats); i++)
-		memcpy(data + i * ETH_GSTRING_LEN,
-		       bcm_phy_hw_stats[i].string, ETH_GSTRING_LEN);
+		strlcpy(data + i * ETH_GSTRING_LEN,
+			bcm_phy_hw_stats[i].string, ETH_GSTRING_LEN);
 }
 EXPORT_SYMBOL_GPL(bcm_phy_get_strings);
 
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
@@ -1452,8 +1452,8 @@ static void marvell_get_strings(struct phy_device *phydev, u8 *data)
 	int i;
 
 	for (i = 0; i < ARRAY_SIZE(marvell_hw_stats); i++) {
-		memcpy(data + i * ETH_GSTRING_LEN,
-		       marvell_hw_stats[i].string, ETH_GSTRING_LEN);
+		strlcpy(data + i * ETH_GSTRING_LEN,
+			marvell_hw_stats[i].string, ETH_GSTRING_LEN);
 	}
 }
 
diff --git 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);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -814,8 +814,8 @@ void b53_get_strings(struct dsa_switch ds, int port, uint8_t data)`
`814`	`814`	`unsigned int i;`
`815`	`815`
`816`	`816`	`for (i = 0; i < mib_size; i++)`
`817`		`- memcpy(data + i * ETH_GSTRING_LEN,`
`818`		`- mibs[i].name, ETH_GSTRING_LEN);`
	`817`	`+ strlcpy(data + i * ETH_GSTRING_LEN,`
	`818`	`+ mibs[i].name, ETH_GSTRING_LEN);`
`819`	`819`	`}`
`820`	`820`	`EXPORT_SYMBOL(b53_get_strings);`
`821`	`821`
Original file line number	Diff line number	Diff line change
`@@ -341,8 +341,8 @@ void bcm_phy_get_strings(struct phy_device phydev, u8 data)`
`341`	`341`	`unsigned int i;`
`342`	`342`
`343`	`343`	`for (i = 0; i < ARRAY_SIZE(bcm_phy_hw_stats); i++)`
`344`		`- memcpy(data + i * ETH_GSTRING_LEN,`
`345`		`- bcm_phy_hw_stats[i].string, ETH_GSTRING_LEN);`
	`344`	`+ strlcpy(data + i * ETH_GSTRING_LEN,`
	`345`	`+ bcm_phy_hw_stats[i].string, ETH_GSTRING_LEN);`
`346`	`346`	`}`
`347`	`347`	`EXPORT_SYMBOL_GPL(bcm_phy_get_strings);`
`348`	`348`
Original file line number	Diff line number	Diff line change
`@@ -1452,8 +1452,8 @@ static void marvell_get_strings(struct phy_device phydev, u8 data)`
`1452`	`1452`	`int i;`
`1453`	`1453`
`1454`	`1454`	`for (i = 0; i < ARRAY_SIZE(marvell_hw_stats); i++) {`
`1455`		`- memcpy(data + i * ETH_GSTRING_LEN,`
`1456`		`- marvell_hw_stats[i].string, ETH_GSTRING_LEN);`
	`1455`	`+ strlcpy(data + i * ETH_GSTRING_LEN,`
	`1456`	`+ marvell_hw_stats[i].string, ETH_GSTRING_LEN);`
`1457`	`1457`	`}`
`1458`	`1458`	`}`
`1459`	`1459`
Original file line number	Diff line number	Diff line change
`@@ -664,8 +664,8 @@ static void kszphy_get_strings(struct phy_device phydev, u8 data)`
`664`	`664`	`int i;`
`665`	`665`
`666`	`666`	`for (i = 0; i < ARRAY_SIZE(kszphy_hw_stats); i++) {`
`667`		`- memcpy(data + i * ETH_GSTRING_LEN,`
`668`		`- kszphy_hw_stats[i].string, ETH_GSTRING_LEN);`
	`667`	`+ strlcpy(data + i * ETH_GSTRING_LEN,`
	`668`	`+ kszphy_hw_stats[i].string, ETH_GSTRING_LEN);`
`669`	`669`	`}`
`670`	`670`	`}`
`671`	`671`