* [PATCH v2 1/3] pstore: use scnprintf
@ 2015-01-06 17:48 Mark Salyzyn
2015-01-06 19:13 ` Kees Cook
0 siblings, 1 reply; 2+ messages in thread
From: Mark Salyzyn @ 2015-01-06 17:48 UTC (permalink / raw)
To: linux-kernel
Cc: joe, Mark Salyzyn, Anton Vorontsov, Colin Cross, Kees Cook, Tony Luck
No guarantees that the names will not exceed the
name buffer with future adjustments.
Signed-off-by: Mark Salyzyn <salyzyn@android.com>
---
fs/pstore/inode.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index 5041660..1948567 100644
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -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;
}
--
2.2.0.rc0.207.ga3a616c
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2 1/3] pstore: use scnprintf
2015-01-06 17:48 [PATCH v2 1/3] pstore: use scnprintf Mark Salyzyn
@ 2015-01-06 19:13 ` Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2015-01-06 19:13 UTC (permalink / raw)
To: Mark Salyzyn; +Cc: LKML, Joe Perches, Anton Vorontsov, Colin Cross, Tony Luck
On Tue, Jan 6, 2015 at 9:48 AM, Mark Salyzyn <salyzyn@android.com> wrote:
> No guarantees that the names will not exceed the
> name buffer with future adjustments.
>
> Signed-off-by: Mark Salyzyn <salyzyn@android.com>
Acked-by: Kees Cook <keescook@chromium.org>
Thanks!
-Kees
> ---
> fs/pstore/inode.c | 23 +++++++++++++----------
> 1 file changed, 13 insertions(+), 10 deletions(-)
>
> diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
> index 5041660..1948567 100644
> --- a/fs/pstore/inode.c
> +++ b/fs/pstore/inode.c
> @@ -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;
> }
>
> --
> 2.2.0.rc0.207.ga3a616c
>
--
Kees Cook
Chrome OS Security
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-01-06 19:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-06 17:48 [PATCH v2 1/3] pstore: use scnprintf Mark Salyzyn
2015-01-06 19:13 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®