[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140914201910.1de7b857@urahara>
Date: Sun, 14 Sep 2014 20:19:10 -0700
From: Stephen Hemminger <stephen@...workplumber.org>
To: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se>
Cc: Mirko Lindner <mlindner@...vell.com>, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] net: ethernet: marvell: sky2.c: Cleaning up missing
null-terminate in conjunction with strncpy
On Sun, 14 Sep 2014 19:33:43 +0200
Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se> wrote:
> Replacing strncpy with strlcpy to avoid strings that lacks null terminate.
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se>
> ---
> drivers/net/ethernet/marvell/sky2.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
> index dba48a5c..7053d38 100644
> --- a/drivers/net/ethernet/marvell/sky2.c
> +++ b/drivers/net/ethernet/marvell/sky2.c
> @@ -4907,7 +4907,7 @@ static const char *sky2_name(u8 chipid, char *buf, int sz)
> };
>
> if (chipid >= CHIP_ID_YUKON_XL && chipid <= CHIP_ID_YUKON_OP_2)
> - strncpy(buf, name[chipid - CHIP_ID_YUKON_XL], sz);
> + strlcpy(buf, name[chipid - CHIP_ID_YUKON_XL], sz);
> else
> snprintf(buf, sz, "(chip %#x)", chipid);
> return buf;
Useless and unnecessary since the list of names is right there.
Why not avoid the copy?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists