linux-hardening - Re: [PATCH v3] NFSD: Remove open coding of string copy

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 15 May 2023 07:21:14 -0400
From:   Jeff Layton <jlayton@...nel.org>
To:     Azeem Shaikh <azeemshaikh38@...il.com>,
        Chuck Lever <chuck.lever@...cle.com>
Cc:     linux-hardening@...r.kernel.org, linux-nfs@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH v3] NFSD: Remove open coding of string copy

On Mon, 2023-05-15 at 02:40 +0000, Azeem Shaikh wrote:
> Instead of open coding a __dynamic_array(), use the __string() and
> __assign_str() helper macros that exist for this kind of use case.
> 
> Part of an effort to remove deprecated strlcpy() [1] completely from the
> kernel[2].
> 
> [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
> [2] https://github.com/KSPP/linux/issues/89
> 
> Fixes: 3c92fba557c6 ("NFSD: Enhance the nfsd_cb_setup tracepoint")
> Signed-off-by: Azeem Shaikh <azeemshaikh38@...il.com>
> ---
>  fs/nfsd/trace.h |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
> index 4183819ea082..72a906a053dc 100644
> --- a/fs/nfsd/trace.h
> +++ b/fs/nfsd/trace.h
> @@ -1365,19 +1365,19 @@ TRACE_EVENT(nfsd_cb_setup,
>  		__field(u32, cl_id)
>  		__field(unsigned long, authflavor)
>  		__sockaddr(addr, clp->cl_cb_conn.cb_addrlen)
> -		__array(unsigned char, netid, 8)
> +		__string(netid, netid)
>  	),
>  	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));
> +		__assign_str(netid, netid);
>  		__entry->authflavor = authflavor;
>  		__assign_sockaddr(addr, &clp->cl_cb_conn.cb_addr,
>  				  clp->cl_cb_conn.cb_addrlen)
>  	),
>  	TP_printk("addr=%pISpc client %08x:%08x proto=%s flavor=%s",
>  		__get_sockaddr(addr), __entry->cl_boot, __entry->cl_id,
> -		__entry->netid, show_nfsd_authflavor(__entry->authflavor))
> +		__get_str(netid), show_nfsd_authflavor(__entry->authflavor))
>  );
>  
>  TRACE_EVENT(nfsd_cb_setup_err,

Reviewed-by: Jeff Layton <jlayton@...nel.org>