Merge ath-next from ath.git

[firefly-linux-kernel-4.4.55.git] / fs / pstore / inode.c

diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index 50416602774d896f2523ee05e49bb2a1c647e1ce..b32ce53d24ee5d7e07af71ee35873b5f7cb27ad4 100644 (file)
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -338,32 +338,38 @@ 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_PMSG:
+               scnprintf(name, sizeof(name), "pmsg-%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;
        }