[PATCH 02/28] sunrpc: Refactor rpc_sockaddr2uaddr() to use snprintf() instead of strlcat()
Jeff Layton
jlayton at kernel.org
Tue Sep 15 10:17:25 UTC 2026
On Tue, 2026-09-15 at 08:18 +0000, Bill Wendling wrote:
> rpc_sockaddr2uaddr() formats the IP address into "addrbuf", formats the
> port into a temporary "portbuf" buffer with snprintf(), and then appends
> "portbuf" to "addrbuf" using strlcat().
>
> In preparation for removing the deprecated strlcat() API[1], capture the
> length returned by rpc_ntop4() and rpc_ntop6_noscopeid() and format the
> port directly onto the end of "addrbuf" with snprintf(). This eliminates
> the strlcat() call and the temporary "portbuf" buffer.
>
> Link: https://github.com/KSPP/linux/issues/370 [1]
> Cc: codemender-patching+linux at google.com
> Assisted-by: CoPilot:3.5-sonnet [editor_update_file, shell_command_run]
> Signed-off-by: Bill Wendling <morbo at google.com>
> ---
> Cc: Russell King <linux at armlinux.org.uk>
> Cc: Huacai Chen <chenhuacai at kernel.org>
> Cc: WANG Xuerui <kernel at xen0n.name>
> Cc: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
> Cc: "James E.J. Bottomley" <James.Bottomley at HansenPartnership.com>
> Cc: Helge Deller <deller at gmx.de>
> Cc: Thomas Gleixner <tglx at kernel.org>
> Cc: Ingo Molnar <mingo at redhat.com>
> Cc: Borislav Petkov <bp at alien8.de>
> Cc: Dave Hansen <dave.hansen at linux.intel.com>
> Cc: x86 at kernel.org
> Cc: "H. Peter Anvin" <hpa at zytor.com>
> Cc: Ian Abbott <abbotti at mev.co.uk>
> Cc: H Hartley Sweeten <hsweeten at visionengravers.com>
> Cc: Tony Luck <tony.luck at intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: Maxime Ripard <mripard at kernel.org>
> Cc: Thomas Zimmermann <tzimmermann at suse.de>
> Cc: David Airlie <airlied at gmail.com>
> Cc: Simona Vetter <simona at ffwll.ch>
> Cc: Matthew Brost <matthew.brost at intel.com>
> Cc: "Thomas Hellström" <thomas.hellstrom at linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Cc: Dmitry Torokhov <dmitry.torokhov at gmail.com>
> Cc: Matthias Schwarzott <zzam at gentoo.org>
> Cc: Mauro Carvalho Chehab <mchehab at kernel.org>
> Cc: Tony Nguyen <anthony.l.nguyen at intel.com>
> Cc: Przemek Kitszel <przemyslaw.kitszel at intel.com>
> Cc: Andrew Lunn <andrew+netdev at lunn.ch>
> Cc: "David S. Miller" <davem at davemloft.net>
> Cc: Eric Dumazet <edumazet at google.com>
> Cc: Jakub Kicinski <kuba at kernel.org>
> Cc: Paolo Abeni <pabeni at redhat.com>
> Cc: Arend van Spriel <arend.vanspriel at broadcom.com>
> Cc: Rob Herring <robh at kernel.org>
> Cc: Saravana Kannan <saravanak at kernel.org>
> Cc: Krzysztof Kozlowski <krzk at kernel.org>
> Cc: Sylwester Nawrocki <s.nawrocki at samsung.com>
> Cc: Peter Griffin <peter.griffin at linaro.org>
> Cc: Alim Akhtar <alim.akhtar at samsung.com>
> Cc: Linus Walleij <linusw at kernel.org>
> Cc: Anil Gurumurthy <anil.gurumurthy at qlogic.com>
> Cc: Sudarsana Kalluru <sudarsana.kalluru at qlogic.com>
> Cc: "Martin K. Petersen" <mkp at kernel.org>
> Cc: Trond Myklebust <trondmy at kernel.org>
> Cc: Anna Schumaker <anna at kernel.org>
> Cc: Mike Marshall <hubcap at omnibond.com>
> Cc: Martin Brandenburg <martin at omnibond.com>
> Cc: Kees Cook <kees at kernel.org>
> Cc: Jiri Pirko <jiri at resnulli.us>
> Cc: Simon Horman <horms at kernel.org>
> Cc: Chuck Lever <cel at kernel.org>
> Cc: Jeff Layton <jlayton at kernel.org>
> Cc: NeilBrown <neil at brown.name>
> Cc: Olga Kornievskaia <okorniev at redhat.com>
> Cc: Dai Ngo <Dai.Ngo at oracle.com>
> Cc: Tom Talpey <tom at talpey.com>
> Cc: Jaroslav Kysela <perex at perex.cz>
> Cc: Takashi Iwai <tiwai at suse.com>
> Cc: Bill Wendling <morbo at google.com>
> Cc: Andrew Morton <akpm at linux-foundation.org>
> Cc: "Mike Rapoport (Microsoft)" <rppt at kernel.org>
> Cc: Kanglong Wang <wangkanglong at loongson.cn>
> Cc: Tiezhu Yang <yangtiezhu at loongson.cn>
> Cc: Qiang Ma <maqianga at uniontech.com>
> Cc: Randy Dunlap <rdunlap at infradead.org>
> Cc: Pengpeng Hou <pengpeng at iscas.ac.cn>
> Cc: Ard Biesheuvel <ardb at kernel.org>
> Cc: Breno Leitao <leitao at debian.org>
> Cc: Thorsten Blum <blum at kernel.org>
> Cc: Harshit Mogalapalli <harshit.m.mogalapalli at oracle.com>
> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> Cc: Lyude Paul <lyude at redhat.com>
> Cc: Ashutosh Desai <ashutoshdesai993 at gmail.com>
> Cc: Imre Deak <imre.deak at intel.com>
> Cc: Dmitry Baryshkov <dmitry.baryshkov at oss.qualcomm.com>
> Cc: Johan Hovold <johan at kernel.org>
> Cc: Johannes Berg <johannes.berg at intel.com>
> Cc: Miri Korenblit <miriam.rachel.korenblit at intel.com>
> Cc: Alexander Stein <alexander.stein at ew.tq-group.com>
> Cc: Cryolitia PukNgae <cryolitia at uniontech.com>
> Cc: Jiaming Zhang <r772577952 at gmail.com>
> Cc: Will Porter <mrwillporter at gmail.com>
> Cc: Cen Zhang <zzzccc427 at gmail.com>
> Cc: "Cássio Gabriel" <cassiogabrielcontato at gmail.com>
> Cc: Rong Zhang <i at rong.moe>
> Cc: Arun Raghavan <arunr at valvesoftware.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> Cc: loongarch at lists.linux.dev
> Cc: linux-mips at vger.kernel.org
> Cc: linux-parisc at vger.kernel.org
> Cc: linux-edac at vger.kernel.org
> Cc: dri-devel at lists.freedesktop.org
> Cc: intel-xe at lists.freedesktop.org
> Cc: linux-input at vger.kernel.org
> Cc: linux-media at vger.kernel.org
> Cc: intel-wired-lan at lists.osuosl.org
> Cc: netdev at vger.kernel.org
> Cc: linux-wireless at vger.kernel.org
> Cc: brcm80211 at lists.linux.dev
> Cc: brcm80211-dev-list.pdl at broadcom.com
> Cc: devicetree at vger.kernel.org
> Cc: linux-samsung-soc at vger.kernel.org
> Cc: linux-gpio at vger.kernel.org
> Cc: linux-scsi at vger.kernel.org
> Cc: linux-nfs at vger.kernel.org
> Cc: devel at lists.orangefs.org
> Cc: linux-hardening at vger.kernel.org
> Cc: linux-sound at vger.kernel.org
> ---
> net/sunrpc/addr.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c
> index 97ff11973c49..a1e4173e5a53 100644
> --- a/net/sunrpc/addr.c
> +++ b/net/sunrpc/addr.c
> @@ -264,18 +264,20 @@ EXPORT_SYMBOL_GPL(rpc_pton);
> */
> char *rpc_sockaddr2uaddr(const struct sockaddr *sap, gfp_t gfp_flags)
> {
> - char portbuf[RPCBIND_MAXUADDRPLEN];
> char addrbuf[RPCBIND_MAXUADDRLEN];
> unsigned short port;
> + size_t len;
>
> switch (sap->sa_family) {
> case AF_INET:
> - if (rpc_ntop4(sap, addrbuf, sizeof(addrbuf)) == 0)
> + len = rpc_ntop4(sap, addrbuf, sizeof(addrbuf));
> + if (len == 0 || len >= sizeof(addrbuf))
> return NULL;
> port = ntohs(((struct sockaddr_in *)sap)->sin_port);
> break;
> case AF_INET6:
> - if (rpc_ntop6_noscopeid(sap, addrbuf, sizeof(addrbuf)) == 0)
> + len = rpc_ntop6_noscopeid(sap, addrbuf, sizeof(addrbuf));
> + if (len == 0 || len >= sizeof(addrbuf))
> return NULL;
> port = ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
> break;
> @@ -283,11 +285,8 @@ char *rpc_sockaddr2uaddr(const struct sockaddr *sap, gfp_t gfp_flags)
> return NULL;
> }
>
> - if (snprintf(portbuf, sizeof(portbuf),
> - ".%u.%u", port >> 8, port & 0xff) >= (int)sizeof(portbuf))
> - return NULL;
> -
> - if (strlcat(addrbuf, portbuf, sizeof(addrbuf)) >= sizeof(addrbuf))
> + if (snprintf(addrbuf + len, sizeof(addrbuf) - len,
> + ".%u.%u", port >> 8, port & 0xff) >= sizeof(addrbuf) - len)
> return NULL;
>
> return kstrdup(addrbuf, gfp_flags);
> @@ -352,3 +351,4 @@ size_t rpc_uaddr2sockaddr(struct net *net, const char *uaddr,
> return 0;
> }
> EXPORT_SYMBOL_GPL(rpc_uaddr2sockaddr);
> +
The last blank line here is not needed. The rest looks fine though.
Reviewed-by: Jeff Layton <jlayton at kernel.org>
More information about the Intel-wired-lan
mailing list