[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <a00c9af7d24ac0dd6af8698c9e545591392720fe.camel@intel.com>
Date: Mon, 07 Oct 2019 13:44:11 -0700
From: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
To: Joe Perches <joe@...ches.com>, intel-wired-lan@...ts.osuosl.org,
netdev <netdev@...r.kernel.org>
Cc: Mitch Williams <mitch.a.williams@...el.com>,
Patryk Małek <patryk.malek@...el.com>
Subject: Re: i40e_pto.c: Odd use of strlcpy converted from strncpy
On Sun, 2019-10-06 at 10:19 -0700, Joe Perches wrote:
> This got converted from strncpy to strlcpy but it's
> now not necessary to use one character less than the
> actual size.
>
> Perhaps the sizeof() - 1 is now not correct and it
> should use strscpy and a normal sizeof.
>
> from:
>
> commit 7eb74ff891b4e94b8bac48f648a21e4b94ddee64
> Author: Mitch Williams <mitch.a.williams@...el.com>
> Date: Mon Aug 20 08:12:30 2018 -0700
>
> i40e: use correct length for strncpy
>
> and
>
> commit 4ff2d8540321324e04c1306f85d4fe68a0c2d0ae
> Author: Patryk Małek <patryk.malek@...el.com>
> Date: Tue Oct 30 10:50:44 2018 -0700
>
> i40e: Replace strncpy with strlcpy to ensure null termination
Looks like you have a typo in the subject, s/i40e_pto.c/i40e_ptp.c/.
You are also missing you signed-off-by: and Fixes:, I can get your
change under test in the meantime to confirm your fix.
> ---
> drivers/net/ethernet/intel/i40e/i40e_ptp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
> b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
> index 9bf1ad4319f5..627b1c02bb4b 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
> @@ -700,8 +700,8 @@ static long i40e_ptp_create_clock(struct i40e_pf
> *pf)
> if (!IS_ERR_OR_NULL(pf->ptp_clock))
> return 0;
>
> - strlcpy(pf->ptp_caps.name, i40e_driver_name,
> - sizeof(pf->ptp_caps.name) - 1);
> + strscpy(pf->ptp_caps.name, i40e_driver_name, sizeof(pf-
> >ptp_caps.name));
> +
> pf->ptp_caps.owner = THIS_MODULE;
> pf->ptp_caps.max_adj = 999999999;
> pf->ptp_caps.n_ext_ts = 0;
>
>
Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)
Powered by blists - more mailing lists