Skip to contentSkip to conversation

edac: replace sprintf() by scnprintf()

PATCH RESEND In review Salah Triki 2 participants 4 messages Jul 10, 2021 – Jul 12, 2021 EDAC-core

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 edac: replace sprintf() by scnprintf()

Replace sprintf() by scnprintf() in order to avoid buffer overflows.

---
 drivers/edac/debugfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/edac/debugfs.c +1 -1
index 4804332d9946..c83653084aa3 100644
@@ -61,7 +61,7 @@ void edac_create_debugfs_nodes(struct mem_ctl_info *mci)
 	parent = debugfs_create_dir(mci->dev.kobj.name, edac_debugfs);
 
 	for (i = 0; i < mci->n_layers; i++) {
-		sprintf(name, "fake_inject_%s",
+		scnprintf(name, sizeof(name), "fake_inject_%s",
 			     edac_layer_name[mci->layers[i].type]);
 		debugfs_create_u8(name, S_IRUGO | S_IWUSR, parent,
 				  &mci->fake_inject_layer[i]);
Signature · 1 line
2.25.1
#1 lore raw
Quoted 1 line · Salah Triki

Replace sprintf() by scnprintf() in order to avoid buffer overflows.

While of course safe, this is not strictly necessary as the maximum length of any edac_layer_name is 8 bytes.

drivers/edac/edac_mc.c:const char *edac_layer_name[] = { drivers/edac/edac_mc.c- [EDAC_MC_LAYER_BRANCH] = "branch", drivers/edac/edac_mc.c- [EDAC_MC_LAYER_CHANNEL] = "channel", drivers/edac/edac_mc.c- [EDAC_MC_LAYER_SLOT] = "slot", drivers/edac/edac_mc.c- [EDAC_MC_LAYER_CHIP_SELECT] = "csrow", drivers/edac/edac_mc.c- [EDAC_MC_LAYER_ALL_MEM] = "memory", drivers/edac/edac_mc.c-};

And name is:

		char name[80];

I suppose name[80] could be changed to name[32] or so at the same time to reduce stack usage.

Maybe name should be moved into the loop too.

---
 drivers/edac/debugfs.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/edac/debugfs.c +4 -3
index 4804332d99465..a41071f2ad428 100644
@@ -55,14 +55,15 @@ void edac_debugfs_exit(void)
 void edac_create_debugfs_nodes(struct mem_ctl_info *mci)
 {
 	struct dentry *parent;
-	char name[80];
 	int i;
 
 	parent = debugfs_create_dir(mci->dev.kobj.name, edac_debugfs);
 
 	for (i = 0; i < mci->n_layers; i++) {
-		sprintf(name, "fake_inject_%s",
-			     edac_layer_name[mci->layers[i].type]);
+		char name[32];
+
+		scnprintf(name, sizeof(name), "fake_inject_%s",
+			  edac_layer_name[mci->layers[i].type]);
 		debugfs_create_u8(name, S_IRUGO | S_IWUSR, parent,
 				  &mci->fake_inject_layer[i]);
 	}
#2 lore raw
Quoted 42 lines · Joe Perches
Quoted 1 line · Salah Triki

Replace sprintf() by scnprintf() in order to avoid buffer overflows.

While of course safe, this is not strictly necessary as the maximum length of any edac_layer_name is 8 bytes.

drivers/edac/edac_mc.c:const char *edac_layer_name[] = { drivers/edac/edac_mc.c- [EDAC_MC_LAYER_BRANCH] = "branch", drivers/edac/edac_mc.c- [EDAC_MC_LAYER_CHANNEL] = "channel", drivers/edac/edac_mc.c- [EDAC_MC_LAYER_SLOT] = "slot", drivers/edac/edac_mc.c- [EDAC_MC_LAYER_CHIP_SELECT] = "csrow", drivers/edac/edac_mc.c- [EDAC_MC_LAYER_ALL_MEM] = "memory", drivers/edac/edac_mc.c-};

And name is:

		char name[80];

I suppose name[80] could be changed to name[32] or so at the same time to reduce stack usage.

Maybe name should be moved into the loop too.

---
 drivers/edac/debugfs.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/edac/debugfs.c +0 -1
index 4804332d99465..a41071f2ad428 100644
@@ -55,14 +55,15 @@ void edac_debugfs_exit(void)
 void edac_create_debugfs_nodes(struct mem_ctl_info *mci)
 {
 	struct dentry *parent;
-	char name[80];
 	int i;
 
 	parent = debugfs_create_dir(mci->dev.kobj.name, edac_debugfs);
 

drivers/edac/debugfs.c void edac_debugfs_exit(void) · line 69

Quoted 10 lines
drivers/edac/debugfs.c +4 -2
 	for (i = 0; i < mci->n_layers; i++) {
-		sprintf(name, "fake_inject_%s",
-			     edac_layer_name[mci->layers[i].type]);
+		char name[32];
+
+		scnprintf(name, sizeof(name), "fake_inject_%s",
+			  edac_layer_name[mci->layers[i].type]);
 		debugfs_create_u8(name, S_IRUGO | S_IWUSR, parent,
 				  &mci->fake_inject_layer[i]);
 	}

I think name should be [20] since len("fake_inject_") is 12 and maximum length of any edac_layer_name is 7 bytes. In addition, for moving the declaration of name inside the loop we need to compile the source in C99 mode.

Thanx

#3 lore raw
Quoted 7 lines · Salah Triki
Quoted 3 lines · Joe Perches
Quoted 1 line · Salah Triki

Replace sprintf() by scnprintf() in order to avoid buffer overflows.

Maybe name should be moved into the loop too.

In addition, for moving the
declaration of name inside the loop we need to compile the source in C99 mode.

You need to read the c90 spec.