From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shuah Khan Subject: Re: [PATCH 18/18] cpupower: change strncpy+truncation to strlcpy Date: Tue, 24 Jul 2018 10:31:15 -0600 Message-ID: <2d421d32-ab85-1d4e-0aaf-7f221e0110b0@kernel.org> References: <1531444483-17338-1-git-send-email-asmadeus@codewreck.org> <1531445169-19912-1-git-send-email-asmadeus@codewreck.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1531445169-19912-1-git-send-email-asmadeus@codewreck.org> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org To: Dominique Martinet Cc: Thomas Renninger , Colin Ian King , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Shuah Khan List-Id: linux-pm@vger.kernel.org On 07/12/2018 07:26 PM, Dominique Martinet wrote: > Generated by scripts/coccinelle/misc/strncpy_truncation.cocci > > Signed-off-by: Dominique Martinet > --- > > Please see https://marc.info/?l=linux-kernel&m=153144450722324&w=2 (the > first patch of the serie) for the motivation behind this patch > > tools/power/cpupower/bench/parse.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/tools/power/cpupower/bench/parse.c b/tools/power/cpupower/bench/parse.c > index 9ba8a44ad2a7..1566b89989b2 100644 > --- a/tools/power/cpupower/bench/parse.c > +++ b/tools/power/cpupower/bench/parse.c > @@ -221,9 +221,8 @@ int prepare_config(const char *path, struct config *config) > sscanf(val, "%u", &config->cpu); > > else if (strcmp("governor", opt) == 0) { > - strncpy(config->governor, val, > + strlcpy(config->governor, val, > sizeof(config->governor)); > - config->governor[sizeof(config->governor) - 1] = '\0'; > } > > else if (strcmp("priority", opt) == 0) { > Thanks for the patch. I will pull this in for 4.19-rc1 -- Shuah