Re: [PATCH] video: fbdev: sis: sis_main.c: Cleaning up missing null-terminate in conjunction with strncpy

[Tomi Valkeinen]

On 14/09/14 20:35, Rickard Strandqvist wrote:
> Replacing strncpy with strlcpy to avoid strings that lacks null terminate.
> 
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
> ---
>  drivers/video/fbdev/sis/sis_main.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/video/fbdev/sis/sis_main.c b/drivers/video/fbdev/sis/sis_main.c
> index 3f12a2d..1f4c216 100644
> --- a/drivers/video/fbdev/sis/sis_main.c
> +++ b/drivers/video/fbdev/sis/sis_main.c
> @@ -5830,7 +5830,7 @@ static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>  			ivideo->cardnumber++;
>  	}
>  
> -	strncpy(ivideo->myid, chipinfo->chip_name, 30);
> +	strlcpy(ivideo->myid, chipinfo->chip_name, sizeof(ivideo->myid));
>  
>  	ivideo->warncount = 0;
>  	ivideo->chip_id = pdev->device;
> 

Thanks, queued for 3.18.

 Tomi

Attachment: signature.asc
Description: OpenPGP digital signature