From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932169AbeASORR (ORCPT ); Fri, 19 Jan 2018 09:17:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:47482 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753332AbeASORK (ORCPT ); Fri, 19 Jan 2018 09:17:10 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 104B320C48 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=rostedt@goodmis.org Date: Fri, 19 Jan 2018 09:17:07 -0500 From: Steven Rostedt To: Sergey Senozhatsky Cc: Petr Mladek , linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: Re: [PATCH] printk: drop redundant devkmsg_log_str memsets Message-ID: <20180119091707.0a15a24d@gandalf.local.home> In-Reply-To: <20180119043901.1728-1-sergey.senozhatsky@gmail.com> References: <20180119043901.1728-1-sergey.senozhatsky@gmail.com> X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 19 Jan 2018 13:39:01 +0900 Sergey Senozhatsky wrote: > We copy in null terminated strings "on" and "off", no > need to zero out devkmsg_log_str in control_devkmsg(). > > Signed-off-by: Sergey Senozhatsky > --- > kernel/printk/printk.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c > index d70927c384f3..9faddcfd3994 100644 > --- a/kernel/printk/printk.c > +++ b/kernel/printk/printk.c > @@ -136,13 +136,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. */ > > /* Yep, and even the sysctl checks for the terminating nul string, so there's no leaks of any kind. Tested by adding: printk.devkmsg=on and running: $ hexdump -C /proc/sys/kernel/printk_devkmsg 00000000 6f 6e 0a |on.| 00000003 Reviewed-by: Steven Rostedt (VMware) -- Steve