aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-12-08 15:06:52 -0800
committerMark Salyzyn <salyzyn@google.com>2015-01-13 16:18:42 -0800
commit3797dc2dca25d4a89ff171990c4e6dba827b8e3d (patch)
tree3736fff2fc6a896abf78fd5ed16eca0ed0da3514
parent6a148888b00dbcb8e76c4ff33b062f6ca5f0cdd9 (diff)
[PATCH v4 1/5] pstore: use snprintf
No guarantees that the names will not exceed the name buffer with future adjustments. Signed-off-by: Mark Salyzyn <salyzyn@android.com> Acked-by: Joe Perches <joe@perches.com> v2: switch from snprintf to scnprintf v3: remove embedded space v4: renumber pmsg series dependencies Change-Id: I161fe8cadc967d74e18cc09b7d60b5b398c92c86
-rw-r--r--fs/pstore/inode.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index e4bcb2cf055a..ae977dd0e426 100644
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -313,22 +313,24 @@ 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", psname, id);
+ scnprintf(name, sizeof(name), "dmesg-%s-%lld",
+ psname, id);
break;
case PSTORE_TYPE_CONSOLE:
- sprintf(name, "console-%s", psname);
+ scnprintf(name, sizeof(name), "console-%s", psname);
break;
case PSTORE_TYPE_FTRACE:
- sprintf(name, "ftrace-%s", psname);
+ scnprintf(name, sizeof(name), "ftrace-%s", psname);
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_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;
}