Skip to contentSkip to conversation

drivers/bus/fsl-mc: Use strscpy() to copy strings into arrays

PATCH Applied [email protected] 3 participants 4 messages Jun 8 – Jul 27 QorIQ DPAA2 fsl-mc bus driver

lore
Share & tools
lore
#0 lore raw

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
index 221146e4860b..372175fe169c 100644
@@ -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
#1 lore raw

Le 08/06/2026 à 11:54, [email protected] a écrit :

Quoted 25 lines

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().

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
index 221146e4860b..372175fe169c 100644
@@ -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)
maintainer Reviewed-by
#2 lore raw
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() 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.)

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.