diff options
author | Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> | 2018-01-18 23:39:01 -0500 |
---|---|---|
committer | Petr Mladek <pmladek@suse.com> | 2018-01-22 04:33:04 -0500 |
commit | 6fd78a1a99c9580da49ee8f951fdce9846256375 (patch) | |
tree | 72805c356b7735b3084d7a50161725339bbc5c4d | |
parent | cca10d58d25d271f05e1115132b4c2d913bb652e (diff) |
printk: drop redundant devkmsg_log_str memsets
We copy in null terminated strings "on" and "off", no
need to zero out devkmsg_log_str in control_devkmsg().
Link: http://lkml.kernel.org/r/20180119043901.1728-1-sergey.senozhatsky@gmail.com
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Petr Mladek <pmladek@suse.com>
-rw-r--r-- | kernel/printk/printk.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 568729e0dc2c..bf2e6741ec12 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c | |||
@@ -131,13 +131,10 @@ static int __init control_devkmsg(char *str) | |||
131 | /* | 131 | /* |
132 | * Set sysctl string accordingly: | 132 | * Set sysctl string accordingly: |
133 | */ | 133 | */ |
134 | if (devkmsg_log == DEVKMSG_LOG_MASK_ON) { | 134 | if (devkmsg_log == DEVKMSG_LOG_MASK_ON) |
135 | memset(devkmsg_log_str, 0, DEVKMSG_STR_MAX_SIZE); | 135 | strcpy(devkmsg_log_str, "on"); |
136 | strncpy(devkmsg_log_str, "on", 2); | 136 | else if (devkmsg_log == DEVKMSG_LOG_MASK_OFF) |
137 | } else if (devkmsg_log == DEVKMSG_LOG_MASK_OFF) { | 137 | strcpy(devkmsg_log_str, "off"); |
138 | memset(devkmsg_log_str, 0, DEVKMSG_STR_MAX_SIZE); | ||
139 | strncpy(devkmsg_log_str, "off", 3); | ||
140 | } | ||
141 | /* else "ratelimit" which is set by default. */ | 138 | /* else "ratelimit" which is set by default. */ |
142 | 139 | ||
143 | /* | 140 | /* |