diff options
author | Kees Cook <keescook@chromium.org> | 2017-05-22 19:49:52 -0400 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2017-05-31 13:13:45 -0400 |
commit | d3762358a739e7ef63873d6923938def99affa93 (patch) | |
tree | feb50fc7d604746621acbc1d7ee9ef018aed7ede | |
parent | c7f3c595f6ff7a1cfbf7ac782722bf5173e27775 (diff) |
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>
-rw-r--r-- | fs/pstore/inode.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c index 792a4e5f9226..4d02c3b65061 100644 --- a/fs/pstore/inode.c +++ b/fs/pstore/inode.c | |||
@@ -349,48 +349,48 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record) | |||
349 | 349 | ||
350 | switch (record->type) { | 350 | switch (record->type) { |
351 | case PSTORE_TYPE_DMESG: | 351 | case PSTORE_TYPE_DMESG: |
352 | scnprintf(name, sizeof(name), "dmesg-%s-%lld%s", | 352 | scnprintf(name, sizeof(name), "dmesg-%s-%llu%s", |
353 | record->psi->name, record->id, | 353 | record->psi->name, record->id, |
354 | record->compressed ? ".enc.z" : ""); | 354 | record->compressed ? ".enc.z" : ""); |
355 | break; | 355 | break; |
356 | case PSTORE_TYPE_CONSOLE: | 356 | case PSTORE_TYPE_CONSOLE: |
357 | scnprintf(name, sizeof(name), "console-%s-%lld", | 357 | scnprintf(name, sizeof(name), "console-%s-%llu", |
358 | record->psi->name, record->id); | 358 | record->psi->name, record->id); |
359 | break; | 359 | break; |
360 | case PSTORE_TYPE_FTRACE: | 360 | case PSTORE_TYPE_FTRACE: |
361 | scnprintf(name, sizeof(name), "ftrace-%s-%lld", | 361 | scnprintf(name, sizeof(name), "ftrace-%s-%llu", |
362 | record->psi->name, record->id); | 362 | record->psi->name, record->id); |
363 | break; | 363 | break; |
364 | case PSTORE_TYPE_MCE: | 364 | case PSTORE_TYPE_MCE: |
365 | scnprintf(name, sizeof(name), "mce-%s-%lld", | 365 | scnprintf(name, sizeof(name), "mce-%s-%llu", |
366 | record->psi->name, record->id); | 366 | record->psi->name, record->id); |
367 | break; | 367 | break; |
368 | case PSTORE_TYPE_PPC_RTAS: | 368 | case PSTORE_TYPE_PPC_RTAS: |
369 | scnprintf(name, sizeof(name), "rtas-%s-%lld", | 369 | scnprintf(name, sizeof(name), "rtas-%s-%llu", |
370 | record->psi->name, record->id); | 370 | record->psi->name, record->id); |
371 | break; | 371 | break; |
372 | case PSTORE_TYPE_PPC_OF: | 372 | case PSTORE_TYPE_PPC_OF: |
373 | scnprintf(name, sizeof(name), "powerpc-ofw-%s-%lld", | 373 | scnprintf(name, sizeof(name), "powerpc-ofw-%s-%llu", |
374 | record->psi->name, record->id); | 374 | record->psi->name, record->id); |
375 | break; | 375 | break; |
376 | case PSTORE_TYPE_PPC_COMMON: | 376 | case PSTORE_TYPE_PPC_COMMON: |
377 | scnprintf(name, sizeof(name), "powerpc-common-%s-%lld", | 377 | scnprintf(name, sizeof(name), "powerpc-common-%s-%llu", |
378 | record->psi->name, record->id); | 378 | record->psi->name, record->id); |
379 | break; | 379 | break; |
380 | case PSTORE_TYPE_PMSG: | 380 | case PSTORE_TYPE_PMSG: |
381 | scnprintf(name, sizeof(name), "pmsg-%s-%lld", | 381 | scnprintf(name, sizeof(name), "pmsg-%s-%llu", |
382 | record->psi->name, record->id); | 382 | record->psi->name, record->id); |
383 | break; | 383 | break; |
384 | case PSTORE_TYPE_PPC_OPAL: | 384 | case PSTORE_TYPE_PPC_OPAL: |
385 | scnprintf(name, sizeof(name), "powerpc-opal-%s-%lld", | 385 | scnprintf(name, sizeof(name), "powerpc-opal-%s-%llu", |
386 | record->psi->name, record->id); | 386 | record->psi->name, record->id); |
387 | break; | 387 | break; |
388 | case PSTORE_TYPE_UNKNOWN: | 388 | case PSTORE_TYPE_UNKNOWN: |
389 | scnprintf(name, sizeof(name), "unknown-%s-%lld", | 389 | scnprintf(name, sizeof(name), "unknown-%s-%llu", |
390 | record->psi->name, record->id); | 390 | record->psi->name, record->id); |
391 | break; | 391 | break; |
392 | default: | 392 | default: |
393 | scnprintf(name, sizeof(name), "type%d-%s-%lld", | 393 | scnprintf(name, sizeof(name), "type%d-%s-%llu", |
394 | record->type, record->psi->name, record->id); | 394 | record->type, record->psi->name, record->id); |
395 | break; | 395 | break; |
396 | } | 396 | } |