From: Chuck Lever III <chuck.lever@oracle.com>
To: Azeem Shaikh <azeemshaikh38@gmail.com>
Cc: Jeff Layton <jlayton@kernel.org>,
"linux-hardening@vger.kernel.org"
<linux-hardening@vger.kernel.org>,
Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] NFSD: Replace all non-returning strlcpy with strscpy
Date: Thu, 11 May 2023 14:47:54 +0000 [thread overview]
Message-ID: <72239648-C807-4CDD-8DA7-18440C83384E@oracle.com> (raw)
In-Reply-To: <20230510220952.3507366-1-azeemshaikh38@gmail.com>
Hello Azeem -
> On May 10, 2023, at 3:09 PM, Azeem Shaikh <azeemshaikh38@gmail.com> wrote:
>
> strlcpy() reads the entire source buffer first.
> This read may exceed the destination size limit.
> This is both inefficient and can lead to linear read
> overflows if a source string is not NUL-terminated [1].
> In an effort to remove strlcpy() completely [2], replace
> strlcpy() here with strscpy().
> No return values were used, so direct replacement is safe.
Actually netid should use the __string() and __assign_str()
macros rather than open-coding a string copy, I think.
> [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
> [2] https://github.com/KSPP/linux/issues/89
>
I suggest adding:
Fixes: 3c92fba557c6 ("NFSD: Enhance the nfsd_cb_setup tracepoint")
> Signed-off-by: Azeem Shaikh <azeemshaikh38@gmail.com>
> ---
> fs/nfsd/trace.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
> index 4183819ea082..9b32cda54808 100644
> --- a/fs/nfsd/trace.h
> +++ b/fs/nfsd/trace.h
> @@ -1370,7 +1370,7 @@ TRACE_EVENT(nfsd_cb_setup,
> TP_fast_assign(
> __entry->cl_boot = clp->cl_clientid.cl_boot;
> __entry->cl_id = clp->cl_clientid.cl_id;
> - strlcpy(__entry->netid, netid, sizeof(__entry->netid));
> + strscpy(__entry->netid, netid, sizeof(__entry->netid));
> __entry->authflavor = authflavor;
> __assign_sockaddr(addr, &clp->cl_cb_conn.cb_addr,
> clp->cl_cb_conn.cb_addrlen)
>
--
Chuck Lever
next prev parent reply other threads:[~2023-05-11 14:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-10 22:09 [PATCH] NFSD: Replace all non-returning strlcpy with strscpy Azeem Shaikh
2023-05-11 14:47 ` Chuck Lever III [this message]
2023-05-11 16:32 ` Kees Cook
2023-05-12 14:30 ` Azeem Shaikh
2023-05-12 14:38 ` Chuck Lever III
2023-05-12 14:47 ` Azeem Shaikh
2023-05-13 23:46 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=72239648-C807-4CDD-8DA7-18440C83384E@oracle.com \
--to=chuck.lever@oracle.com \
--cc=azeemshaikh38@gmail.com \
--cc=jlayton@kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox