Skip to contentSkip to conversation

pstore: use scnprintf

PATCH Superseded Mark Salyzyn 2 participants 3 messages Jan 6, 2015 – Jan 7, 2015 Pstore filesystem

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/3 pstore: use scnprintf

No guarantees that the names will not exceed the
name buffer with future adjustments.

---
 fs/pstore/inode.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)
fs/pstore/inode.c +13 -10
index 5041660..d69586f 100644
@@ -338,32 +338,35 @@ int pstore_mkfile(enum pstore_type_id type, char *psname, u64 id, int count,
 
 	switch (type) {
 	case PSTORE_TYPE_DMESG:
-		sprintf(name, "dmesg-%s-%lld%s", psname, id,
-						compressed ? ".enc.z" : "");
+		scnprintf(name, sizeof(name), "dmesg-%s-%lld%s",
+			  psname, id, compressed ? ".enc.z" : "");
 		break;
 	case PSTORE_TYPE_CONSOLE:
-		sprintf(name, "console-%s-%lld", psname, id);
+		scnprintf(name, sizeof(name), "console-%s-%lld", psname, id);
 		break;
 	case PSTORE_TYPE_FTRACE:
-		sprintf(name, "ftrace-%s-%lld", psname, id);
+		scnprintf(name, sizeof(name), "ftrace-%s-%lld", psname, id);
 		break;
 	case PSTORE_TYPE_MCE:
-		sprintf(name, "mce-%s-%lld", psname, id);
+		scnprintf(name, sizeof(name), "mce-%s-%lld", psname, id);
 		break;
 	case PSTORE_TYPE_PPC_RTAS:
-		sprintf(name, "rtas-%s-%lld", psname, id);
+		scnprintf(name, sizeof(name), "rtas-%s-%lld", psname, id);
 		break;
 	case PSTORE_TYPE_PPC_OF:
-		sprintf(name, "powerpc-ofw-%s-%lld", psname, id);
+		scnprintf(name, sizeof(name), "powerpc-ofw-%s-%lld",
+			  psname, id);
 		break;
 	case PSTORE_TYPE_PPC_COMMON:
-		sprintf(name, "powerpc-common-%s-%lld", psname, id);
+		scnprintf(name, sizeof(name), "powerpc-common-%s-%lld",
+			  psname, id);
 		break;
 	case PSTORE_TYPE_UNKNOWN:
-		sprintf(name, "unknown-%s-%lld", psname, id);
+		scnprintf(name, sizeof(name), "unknown-%s-%lld", psname, id);
 		break;
 	default:
-		sprintf(name, "type%d-%s-%lld", type, psname, id);
+		scnprintf(name, sizeof(name), "type%d-%s-%lld",
+			  type, psname, id);
 		break;
 	}
 
Signature · 1 line
2.2.0.rc0.207.ga3a616c
#1 lore raw
Quoted 2 lines · Mark Salyzyn

No guarantees that the names will not exceed the
name buffer with future adjustments.

It'd be nice to describe the changes between versions.

Typically, it's done after the --- line separating the changelog and sign-off and the patch.

cheers, Joe

#2 lore raw
Quoted 6 lines · Joe Perches

It'd be nice to describe the changes between versions.

Typically, it's done after the --- line separating the changelog and sign-off and the patch.

cheers, Joe

Thanks.

For the record:

Original: used snprintf
V2: switched to scnprintf, but one line-wrap had an embedded space
V3: dropped the embedded space (inert)

Used git-email for submissions for the first time, consider the lack of comment learning a new workflow (its been a few years since my last submissions, forgive me gohd, for I have sinned)

Sincerely -- Mark Salyzyn