Skip to contentSkip to conversation

drivers/usb/atm: Replace strcpy() + strlcat() with snprintf()

PATCH Applied [email protected] 2 participants 2 messages Jun 8 – Jun 10

Subsystems (5)
Networking Network drivers USB ATM +1 more subsystems
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/usb/atm: Replace strcpy() + strlcat() with snprintf()

From: David Laight <[email protected]>

Avoid string function that are due to be deprecated.

---
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/usb/atm/ueagle-atm.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/usb/atm/ueagle-atm.c +1 -4
index f3ae72feb5bf..df4477668296 100644
@@ -1572,10 +1572,7 @@ static void cmvs_file_name(struct uea_softc *sc, char *const cmv_name, int ver)
 	} else
 		file = cmv_file[sc->modem_index];
 
-	strcpy(cmv_name, FW_DIR);
-	strlcat(cmv_name, file, UEA_FW_NAME_MAX);
-	if (ver == 2)
-		strlcat(cmv_name, ".v2", UEA_FW_NAME_MAX);
+	snprintf(cmv_name, UEA_FW_NAME_MAX, FW_DIR "%s%s", file, ver == 2 ? ".v2" : "");
 	kernel_param_unlock(THIS_MODULE);
 }
 
Signature · 1 line
2.39.5
#1 lore raw
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 10 lines · On Mon, 8 Jun 2026 10:55:20 +0100 you wrote:

From: David Laight <[email protected]>

Avoid string function that are due to be deprecated.

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

[...]

Here is the summary with links:
- [next] drivers/usb/atm: Replace strcpy() + strlcat() with snprintf()

    https://git.kernel.org/netdev/net-next/c/41d3e102edc2

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html