From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A498D19F40B; Thu, 25 Sep 2025 16:52:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758819132; cv=none; b=Qe3wW5vAAbJn2ldHZhVtLpxTzlO7HrskDHKOHToiGaT7aqTrqQFxTx0ZjyPoGwes+9LnKTsZWqgJy6jfN6aH7AWnKWUpnmOHnmfh/f19fuCJhxCDEXOYMKCRTJsx+7XSEw9k9YxAlAfT8nNeSAzJK7B8u6ifh+p9AMJFxy0ZLjs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758819132; c=relaxed/simple; bh=VkJA++MO/cZGItX7FAQtyoD0VrKTxRbiiUCRw5W5bec=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=udWRhUfGAEgf2LXJ8MrNkwDIFOwdPtQkofT6pifC5yuwuzNlQiMrU6axxn4I4msxh2wLxaPgoRYNZwLEUpFSqcOPC6m344lEvDk/NARQjWk3FQKQJs+HDju6FG1jRwBKDoDzWz+blROLsSxSVf0pabuc7FT0egGhMY06Q9UQwNo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XHK0pqRB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XHK0pqRB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AF82C4CEF0; Thu, 25 Sep 2025 16:52:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758819132; bh=VkJA++MO/cZGItX7FAQtyoD0VrKTxRbiiUCRw5W5bec=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=XHK0pqRBbcCdeeCP+D2GZMyB8Idz0LNryHQqiYlLwoYGdv7hTe/moyeXBGEQxOUYA lHIJriNv8hRJQqJ5ZfFTNgyUPtvv3gdMFyg6YVG8rtid35fS2lEKymWmyH0UM9PqnT 1Rm9eFSrkFE6aEBR/WO0I1xXU+FSAOm66dlrHObxuwLJdmu9t+A4qL+80at6OYn2br 2scDoTNQ8lQpLnELxg6nZH6G/52++ly6I78d/lanAllSQV1r7zJtTyITSVEBCJ368j xQrwyWhfLiO1pan4g/nyxxszjkepbCxf1zrhFSUDlMryjjf480+g8WMo9cM0Kll+18 gywA4ayX7fGrQ== Message-ID: <27d0b9176a444dcf87ecd40c17b6ed1865c1b789.camel@kernel.org> Subject: Re: [PATCH] nfsd: Move strlen declaration in nfsd4_encode_components_esc() From: Jeff Layton To: Chuck Lever , Nathan Chancellor Cc: NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Simon Horman , linux-nfs@vger.kernel.org, patches@lists.linux.dev, Anna Schumaker Date: Thu, 25 Sep 2025 12:52:10 -0400 In-Reply-To: <6669bd1e-ba37-433a-8f8c-5cd9787b846f@oracle.com> References: <20250925-nfsd-fix-trace-printk-strlen-error-v1-1-1360530e4c6b@kernel.org> <6669bd1e-ba37-433a-8f8c-5cd9787b846f@oracle.com> Autocrypt: addr=jlayton@kernel.org; prefer-encrypt=mutual; keydata=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 QZIQXVeAA+smfTT0tDrisj1U5x6ZB9b3nBg65kc= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.56.2 (3.56.2-2.fc42) Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Thu, 2025-09-25 at 09:43 -0400, Chuck Lever wrote: > On 9/25/25 5:14 AM, Nathan Chancellor wrote: > > There is an error building nfs4xdr.c with CONFIG_SUNRPC_DEBUG_TRACE=3Dy > > and CONFIG_FORTIFY_SOURCE=3Dn due to the local variable strlen conflict= ing > > with the function strlen(): > >=20 > > In file included from include/linux/cpumask.h:11, > > from arch/x86/include/asm/paravirt.h:21, > > from arch/x86/include/asm/irqflags.h:102, > > from include/linux/irqflags.h:18, > > from include/linux/spinlock.h:59, > > from include/linux/mmzone.h:8, > > from include/linux/gfp.h:7, > > from include/linux/slab.h:16, > > from fs/nfsd/nfs4xdr.c:37: > > fs/nfsd/nfs4xdr.c: In function 'nfsd4_encode_components_esc': > > include/linux/kernel.h:321:46: error: called object 'strlen' is not a= function or function pointer > > 321 | __trace_puts(_THIS_IP_, str, strlen(str)); = \ > > | ^~~~~~ > > include/linux/kernel.h:265:17: note: in expansion of macro 'trace_put= s' > > 265 | trace_puts(fmt); \ > > | ^~~~~~~~~~ > > include/linux/sunrpc/debug.h:34:41: note: in expansion of macro 'trac= e_printk' > > 34 | # define __sunrpc_printk(fmt, ...) trace_printk(fmt, ##_= _VA_ARGS__) > > | ^~~~~~~~~~~~ > > include/linux/sunrpc/debug.h:42:17: note: in expansion of macro '__su= nrpc_printk' > > 42 | __sunrpc_printk(fmt, ##__VA_ARGS__); = \ > > | ^~~~~~~~~~~~~~~ > > include/linux/sunrpc/debug.h:25:9: note: in expansion of macro 'dfpri= ntk' > > 25 | dfprintk(FACILITY, fmt, ##__VA_ARGS__) > > | ^~~~~~~~ > > fs/nfsd/nfs4xdr.c:2646:9: note: in expansion of macro 'dprintk' > > 2646 | dprintk("nfsd4_encode_components(%s)\n", components); > > | ^~~~~~~ > > fs/nfsd/nfs4xdr.c:2643:13: note: declared here > > 2643 | int strlen, count=3D0; > > | ^~~~~~ > >=20 > > Move the declaration of strlen into the while loop (as that is the only > > place where it is used), which is after the call to dprintk, to clear u= p > > the error. > >=20 > > Fixes: ec7d8e68ef0e ("sunrpc: add a Kconfig option to redirect dfprintk= () output to trace buffer") > > Signed-off-by: Nathan Chancellor > > --- > > This solution may be too subtle but given that dprintk() seems to be on > > its way out, maybe it is fine. An alternative would be a rename such as > > str_len but there is some symmetry with pathlen so I opted for this one > > up front. > > --- > > fs/nfsd/nfs4xdr.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > >=20 > > diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c > > index ea91bad4eee2..580bfa8011c7 100644 > > --- a/fs/nfsd/nfs4xdr.c > > +++ b/fs/nfsd/nfs4xdr.c > > @@ -2640,7 +2640,7 @@ static __be32 nfsd4_encode_components_esc(struct = xdr_stream *xdr, char sep, > > __be32 *p; > > __be32 pathlen; > > int pathlen_offset; > > - int strlen, count=3D0; > > + int count=3D0; > > char *str, *end, *next; > > =20 > > dprintk("nfsd4_encode_components(%s)\n", components); > > @@ -2654,6 +2654,7 @@ static __be32 nfsd4_encode_components_esc(struct = xdr_stream *xdr, char sep, > > end =3D str =3D components; > > while (*end) { > > bool found_esc =3D false; > > + int strlen; > > =20 > > /* try to parse as esc_start, ..., esc_end, sep */ > > if (*str =3D=3D esc_enter) { > >=20 > > --- > > base-commit: 3fadfaec904dffab02ebf63dd9c2ae8fa15c6d32 > > change-id: 20250925-nfsd-fix-trace-printk-strlen-error-2a24413eb186 > >=20 > > Best regards, > > -- =20 > > Nathan Chancellor > >=20 >=20 > Would anyone be heartbroken if this patch removed the dprintk call site? >=20 > I think renaming the strlen variable to a name with a lower collision > risk would be sensible as well. >=20 Fine with me on both counts. No point in overloading a well known function name here. --=20 Jeff Layton