drivers/bus/fsl-mc: Use strscpy() to copy strings into arrays
PATCH 1/1 drivers/bus/fsl-mc: Use strscpy() to copy strings into arrays
From: David Laight <[email protected]>
Replacing strcpy() with strscpy() ensures than overflow of the target buffer cannot happen.
---
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/bus/fsl-mc/fsl-mc-bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bus/fsl-mc/fsl-mc-bus.c +2 -2
@@ -903,7 +903,7 @@ struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev,int state, err; mc_bus_dev =to_fsl_mc_device (mc_dev->dev.parent); -strcpy (endpoint1.type, mc_dev->obj_desc.type); +strscpy (endpoint1.type, mc_dev->obj_desc.type); endpoint1.id = mc_dev->obj_desc.id; endpoint1.if_id = if_id;
@@ -920,7 +920,7 @@ struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev,return ERR_PTR (err); } -strcpy (endpoint_desc.type, endpoint2.type); +strscpy (endpoint_desc.type, endpoint2.type); endpoint_desc.id = endpoint2.id; endpoint =fsl_mc_device_lookup (&endpoint_desc, mc_bus_dev);if (endpoint)
Signature · 1 line
2.39.5
Le 08/06/2026 à 11:54, [email protected] a écrit :
Quoted 25 lines
From: David Laight <[email protected]>
Replacing
strcpy()withstrscpy()ensures than overflow of the target buffer cannot happen.Signed-off-by David Laight <[email protected]>---
This is one of a group of patches that remove potentially unboundedstrcpy()calls.They are mostly replaced by
strscpy()or, whenstrlen()has just been called, withmemcpy()(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 usesysfs_emit()orseq_printf().
Quoted 6 lines
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/bus/fsl-mc/fsl-mc-bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Do you expect this patch to go via individual trees or will you apply them all together in a given tree ?
Ioana, as usual I can take it via soc/fsl/ with your Ack.
Christophe
Quoted 23 lines
drivers/bus/fsl-mc/fsl-mc-bus.c +2
-2@@ -903,7 +903,7 @@ struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev,int state, err; mc_bus_dev =to_fsl_mc_device (mc_dev->dev.parent); -strcpy (endpoint1.type, mc_dev->obj_desc.type); +strscpy (endpoint1.type, mc_dev->obj_desc.type); endpoint1.id = mc_dev->obj_desc.id; endpoint1.if_id = if_id;@@ -920,7 +920,7 @@ struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev,return ERR_PTR (err); } -strcpy (endpoint_desc.type, endpoint2.type); +strscpy (endpoint_desc.type, endpoint2.type); endpoint_desc.id = endpoint2.id; endpoint =fsl_mc_device_lookup (&endpoint_desc, mc_bus_dev);if (endpoint)
Quoted 32 lines · Christophe Leroy (CS GROUP)
Le 08/06/2026 à 11:54, [email protected] a écrit :
Quoted 29 lines
From: David Laight <[email protected]>
Replacing
strcpy()withstrscpy()ensures than overflow of the target buffer cannot happen.Signed-off-by David Laight <[email protected]>---
This is one of a group of patches that remove potentially unboundedstrcpy()calls.They are mostly replaced by
strscpy()or, whenstrlen()has just been called, withmemcpy()(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 usesysfs_emit()orseq_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.)
Quoted 7 lines
Quoted 2 lines
drivers/bus/fsl-mc/fsl-mc-bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)Do you expect this patch to go via individual trees or will you apply them all together in a given tree ?
Ioana, as usual I can take it via soc/fsl/ with your Ack.
Yes, you can take the patch through soc/fsl.
Christophe Leroy (CS GROUP)
AppliedQuoted 4 lines · On Mon, 08 Jun 2026 10:54:56 +0100, [email protected] wrote:
Replacing
strcpy()withstrscpy()ensures than overflow of the target buffer cannot happen.
Applied, thanks!
[1/1] drivers/bus/fsl-mc: Use strscpy() to copy strings into arrays
commit: e0bdf39890814b5dd5481c8f9c80c5f8399fa6cb
Best regards,
Signature · 1 line
Christophe Leroy (CS GROUP) <[email protected]>