aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Senozhatsky <[email protected]>2018-01-19 13:39:01 +0900
committerPetr Mladek <[email protected]>2018-01-22 10:33:04 +0100
commit6fd78a1a99c9580da49ee8f951fdce9846256375 (patch)
tree72805c356b7735b3084d7a50161725339bbc5c4d
parentcca10d58d25d271f05e1115132b4c2d913bb652e (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/[email protected] Cc: [email protected] Signed-off-by: Sergey Senozhatsky <[email protected]> Reviewed-by: Steven Rostedt (VMware) <[email protected]> Signed-off-by: Petr Mladek <[email protected]>
-rw-r--r--kernel/printk/printk.c11
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)
/*
* Set sysctl string accordingly:
*/
- if (devkmsg_log == DEVKMSG_LOG_MASK_ON) {
- memset(devkmsg_log_str, 0, DEVKMSG_STR_MAX_SIZE);
- strncpy(devkmsg_log_str, "on", 2);
- } else if (devkmsg_log == DEVKMSG_LOG_MASK_OFF) {
- memset(devkmsg_log_str, 0, DEVKMSG_STR_MAX_SIZE);
- strncpy(devkmsg_log_str, "off", 3);
- }
+ if (devkmsg_log == DEVKMSG_LOG_MASK_ON)
+ strcpy(devkmsg_log_str, "on");
+ else if (devkmsg_log == DEVKMSG_LOG_MASK_OFF)
+ strcpy(devkmsg_log_str, "off");
/* else "ratelimit" which is set by default. */
/*