Re: [PATCH] block: elevator.c: Cleaning up missing null-terminate in conjunction with strncpy

[Jeff Moyer]

Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> writes:

> Replacing strncpy with strlcpy to avoid strings that lacks null terminate.
> And set a string to be empty from the start.
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
> ---
>  block/elevator.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/block/elevator.c b/block/elevator.c
> index 24c28b6..ad17774 100644
> --- a/block/elevator.c
> +++ b/block/elevator.c
> @@ -118,7 +118,7 @@ static struct elevator_type *elevator_get(const char *name, bool try_loading)
>  	return e;
>  }
>  
> -static char chosen_elevator[ELV_NAME_MAX];
> +static char chosen_elevator[ELV_NAME_MAX] = "";
>  
>  static int __init elevator_setup(char *str)
>  {
> @@ -126,7 +126,7 @@ static int __init elevator_setup(char *str)
>  	 * Be backwards-compatible with previous kernels, so users
>  	 * won't get the wrong elevator.
>  	 */
> -	strncpy(chosen_elevator, str, sizeof(chosen_elevator) - 1);
> +	strlcpy(chosen_elevator, str, sizeof(chosen_elevator));
>  	return 1;
>  }

NACK.  bss is zeroed.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/