Skip to contentSkip to conversation

drivers/net/ethernet/qualcomm/emac: Use strscpy() to copy the ethtool strings

PATCH In review [email protected] 2 participants 4 messages Jun 8 – Jun 9

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/net/ethernet/qualcomm/emac: Use strscpy() to copy the ethtool strings

From: David Laight <[email protected]>

While the string is short it is still best to use strscpy() with length ETH_GSTRING_LEN.
Should still get optimised to a memcpy().

---
This is one of a group of patches that remove potentially unbounded strcpy() calls.

They are mostly replaced by strscpy() or, when strlen() has just been called, with memcpy() (usually including the '\0').

Calls with copy string literals into arrays are left unchanged. They are safe and easily detected as such.

The changes were made by getting the compiler to detect the calls and then fixing the code by hand.

Note that all the changes are only compile tested.

Some Makefiles were changed to allow files to contain strcpy(). As well as 'difficult to fix' files, this included 'show' functions as they really need to use sysfs_emit() or seq_printf().

All the patches are being sent individually to avoid very long cc lists. Apologies for the terse commit messages and likely unexpected tags. (There are about 100 patches in total.)

 drivers/net/ethernet/qualcomm/emac/emac-ethtool.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/qualcomm/emac/emac-ethtool.c +1 -1
index f502db9cdea9..ffc300641aac 100644
@@ -95,7 +95,7 @@ static void emac_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
 
 	switch (stringset) {
 	case ETH_SS_PRIV_FLAGS:
-		strcpy(data, "single-pause-mode");
+		strscpy(data, "single-pause-mode", ETH_GSTRING_LEN);
 		break;
 
 	case ETH_SS_STATS:
Signature · 1 line
2.39.5
maintainer
#1 lore raw

drivers/net/ethernet/qualcomm/emac/emac-ethtool.c static void emac_get_strings(struct net_device *netdev, u32 stringset, u8 *data) · line 99

Quoted 12 lines · On Mon, Jun 8, 2026 at 4:55 AM <[email protected]> wrote:
drivers/net/ethernet/qualcomm/emac/emac-ethtool.c +1 -1
index f502db9cdea9..ffc300641aac 100644
@@ -95,7 +95,7 @@ static void emac_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
 
        switch (stringset) {
        case ETH_SS_PRIV_FLAGS:
-               strcpy(data, "single-pause-mode");
+               strscpy(data, "single-pause-mode", ETH_GSTRING_LEN);
                break;

It would be better to replace this with a call to ethtool_sprintf(), which already takes ETH_GSTRING_LEN into account. And may as well update the ETH_SS_STATS case underneath it.

Quoted 4 lines
drivers/net/ethernet/qualcomm/emac/emac-ethtool.c +0 -1
        case ETH_SS_STATS:
--

2.39.5

maintainer
#2 lore raw
Quoted 3 lines · Timur Tabi

It would be better to replace this with a call to ethtool_sprintf(), which already takes ETH_GSTRING_LEN into account. And may as well update the ETH_SS_STATS case underneath it.

Actually, on second thought, I take that back. There are no format strings, so no need for sprintf.

maintainer Acked-by on v1 1/1
#3 lore raw
In reply to [email protected]

drivers/net/ethernet/qualcomm/emac/emac-ethtool.c static void emac_get_strings(struct net_device *netdev, u32 stringset, u8 *data) · line 99

Quoted 11 lines
drivers/net/ethernet/qualcomm/emac/emac-ethtool.c +1 -1
index f502db9cdea9..ffc300641aac 100644
@@ -95,7 +95,7 @@ static void emac_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
 
        switch (stringset) {
        case ETH_SS_PRIV_FLAGS:
-               strcpy(data, "single-pause-mode");
+               strscpy(data, "single-pause-mode", ETH_GSTRING_LEN);
                break;