lkml.org 
[lkml]   [2018]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 18/18] cpupower: change strncpy+truncation to strlcpy
From
Date
On 07/12/2018 07:26 PM, Dominique Martinet wrote:
> Generated by scripts/coccinelle/misc/strncpy_truncation.cocci
>
> Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>
> ---
>
> 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

\
 
 \ /
  Last update: 2018-07-24 18:32    [W:0.328 / U:0.728 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site