linux-kernel - Re: [PATCH] power: supply: use strscpy() is more robust and safer

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Fri, 3 Feb 2023 14:00:45 +0100
From:   Sebastian Reichel <sebastian.reichel@...labora.com>
To:     cgel.zte@...il.com
Cc:     linux-pm@...r.kernel.org, linux-kernel@...r.kernel.org,
        Minghao Chi <chi.minghao@....com.cn>,
        Zeal Robot <zealci@....com.cn>
Subject: Re: [PATCH] power: supply: use strscpy() is more robust and safer

Hi,

On Mon, Sep 19, 2022 at 02:49:19AM +0000, cgel.zte@...il.com wrote:
> From: Minghao Chi <chi.minghao@....com.cn>
> 
> The implementation of strscpy() is more robust and safer.
> 
> That's now the recommended way to copy NUL terminated strings.
> 
> Reported-by: Zeal Robot <zealci@....com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@....com.cn>
> ---

Sorry, this fell between the cracks. Applied now, thanks!

-- Sebastian

>  drivers/power/supply/max1721x_battery.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/power/supply/max1721x_battery.c b/drivers/power/supply/max1721x_battery.c
> index 473e53cd2801..0f948db958d5 100644
> --- a/drivers/power/supply/max1721x_battery.c
> +++ b/drivers/power/supply/max1721x_battery.c
> @@ -384,7 +384,7 @@ static int devm_w1_max1721x_add_device(struct w1_slave *sl)
>  	}
>  
>  	if (!info->ManufacturerName[0])
> -		strncpy(info->ManufacturerName, DEF_MFG_NAME,
> +		strscpy(info->ManufacturerName, DEF_MFG_NAME,
>  			2 * MAX1721X_REG_MFG_NUMB);
>  
>  	if (get_string(info, MAX1721X_REG_DEV_STR,
> @@ -403,15 +403,15 @@ static int devm_w1_max1721x_add_device(struct w1_slave *sl)
>  
>  		switch (dev_name & MAX172XX_DEV_MASK) {
>  		case MAX172X1_DEV:
> -			strncpy(info->DeviceName, DEF_DEV_NAME_MAX17211,
> +			strscpy(info->DeviceName, DEF_DEV_NAME_MAX17211,
>  				2 * MAX1721X_REG_DEV_NUMB);
>  			break;
>  		case MAX172X5_DEV:
> -			strncpy(info->DeviceName, DEF_DEV_NAME_MAX17215,
> +			strscpy(info->DeviceName, DEF_DEV_NAME_MAX17215,
>  				2 * MAX1721X_REG_DEV_NUMB);
>  			break;
>  		default:
> -			strncpy(info->DeviceName, DEF_DEV_NAME_UNKNOWN,
> +			strscpy(info->DeviceName, DEF_DEV_NAME_UNKNOWN,
>  				2 * MAX1721X_REG_DEV_NUMB);
>  		}
>  	}
> -- 
> 2.25.1

Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)