Эх сурвалжийг харах

pstore: Fix format string to use %u for record id

The format string for record->id (u64) was using %lld instead of %llu.

Signed-off-by: Kees Cook <keescook@chromium.org>
Kees Cook 8 жил өмнө
parent
commit
d3762358a7
1 өөрчлөгдсөн 11 нэмэгдсэн , 11 устгасан
  1. 11 11
      fs/pstore/inode.c

+ 11 - 11
fs/pstore/inode.c

@@ -349,48 +349,48 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)
 
 
 	switch (record->type) {
 	switch (record->type) {
 	case PSTORE_TYPE_DMESG:
 	case PSTORE_TYPE_DMESG:
-		scnprintf(name, sizeof(name), "dmesg-%s-%lld%s",
+		scnprintf(name, sizeof(name), "dmesg-%s-%llu%s",
 			  record->psi->name, record->id,
 			  record->psi->name, record->id,
 			  record->compressed ? ".enc.z" : "");
 			  record->compressed ? ".enc.z" : "");
 		break;
 		break;
 	case PSTORE_TYPE_CONSOLE:
 	case PSTORE_TYPE_CONSOLE:
-		scnprintf(name, sizeof(name), "console-%s-%lld",
+		scnprintf(name, sizeof(name), "console-%s-%llu",
 			  record->psi->name, record->id);
 			  record->psi->name, record->id);
 		break;
 		break;
 	case PSTORE_TYPE_FTRACE:
 	case PSTORE_TYPE_FTRACE:
-		scnprintf(name, sizeof(name), "ftrace-%s-%lld",
+		scnprintf(name, sizeof(name), "ftrace-%s-%llu",
 			  record->psi->name, record->id);
 			  record->psi->name, record->id);
 		break;
 		break;
 	case PSTORE_TYPE_MCE:
 	case PSTORE_TYPE_MCE:
-		scnprintf(name, sizeof(name), "mce-%s-%lld",
+		scnprintf(name, sizeof(name), "mce-%s-%llu",
 			  record->psi->name, record->id);
 			  record->psi->name, record->id);
 		break;
 		break;
 	case PSTORE_TYPE_PPC_RTAS:
 	case PSTORE_TYPE_PPC_RTAS:
-		scnprintf(name, sizeof(name), "rtas-%s-%lld",
+		scnprintf(name, sizeof(name), "rtas-%s-%llu",
 			  record->psi->name, record->id);
 			  record->psi->name, record->id);
 		break;
 		break;
 	case PSTORE_TYPE_PPC_OF:
 	case PSTORE_TYPE_PPC_OF:
-		scnprintf(name, sizeof(name), "powerpc-ofw-%s-%lld",
+		scnprintf(name, sizeof(name), "powerpc-ofw-%s-%llu",
 			  record->psi->name, record->id);
 			  record->psi->name, record->id);
 		break;
 		break;
 	case PSTORE_TYPE_PPC_COMMON:
 	case PSTORE_TYPE_PPC_COMMON:
-		scnprintf(name, sizeof(name), "powerpc-common-%s-%lld",
+		scnprintf(name, sizeof(name), "powerpc-common-%s-%llu",
 			  record->psi->name, record->id);
 			  record->psi->name, record->id);
 		break;
 		break;
 	case PSTORE_TYPE_PMSG:
 	case PSTORE_TYPE_PMSG:
-		scnprintf(name, sizeof(name), "pmsg-%s-%lld",
+		scnprintf(name, sizeof(name), "pmsg-%s-%llu",
 			  record->psi->name, record->id);
 			  record->psi->name, record->id);
 		break;
 		break;
 	case PSTORE_TYPE_PPC_OPAL:
 	case PSTORE_TYPE_PPC_OPAL:
-		scnprintf(name, sizeof(name), "powerpc-opal-%s-%lld",
+		scnprintf(name, sizeof(name), "powerpc-opal-%s-%llu",
 			  record->psi->name, record->id);
 			  record->psi->name, record->id);
 		break;
 		break;
 	case PSTORE_TYPE_UNKNOWN:
 	case PSTORE_TYPE_UNKNOWN:
-		scnprintf(name, sizeof(name), "unknown-%s-%lld",
+		scnprintf(name, sizeof(name), "unknown-%s-%llu",
 			  record->psi->name, record->id);
 			  record->psi->name, record->id);
 		break;
 		break;
 	default:
 	default:
-		scnprintf(name, sizeof(name), "type%d-%s-%lld",
+		scnprintf(name, sizeof(name), "type%d-%s-%llu",
 			  record->type, record->psi->name, record->id);
 			  record->type, record->psi->name, record->id);
 		break;
 		break;
 	}
 	}