Messages in this thread Patch in this message | | | Subject | [PATCH] printk: Don't read beyond string arguments' terminating zero | From | Markus Armbruster <> | Date | Wed, 09 Apr 2008 18:41:33 +0200 |
| |
Fix add_preferred_console() and update_console_cmdline() not to to read beyond the terminating zero of their name argument.
Signed-off-by: Markus Armbruster <armbru@redhat.com> --- kernel/printk.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/printk.c b/kernel/printk.c index c46a20a..52526df 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -865,7 +865,7 @@ int add_preferred_console(char *name, int idx, char *options) return -E2BIG; selected_console = i; c = &console_cmdline[i]; - memcpy(c->name, name, sizeof(c->name)); + strlcpy(c->name, name, sizeof(c->name)); c->name[sizeof(c->name) - 1] = 0; c->options = options; c->index = idx; @@ -881,7 +881,7 @@ int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, cha if (strcmp(console_cmdline[i].name, name) == 0 && console_cmdline[i].index == idx) { c = &console_cmdline[i]; - memcpy(c->name, name_new, sizeof(c->name)); + strlcpy(c->name, name_new, sizeof(c->name)); c->name[sizeof(c->name) - 1] = 0; c->options = options; c->index = idx_new; -- 1.5.3.3
| |