From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 540BE3F1ACE for ; Tue, 15 Sep 2026 08:19:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.198 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460435; cv=none; b=tGGLI+bjrQqeZv81OQwffoKUZHC6HytLz11Xz0MlvxyUQnauWAEsfXieYvHVFHwRf+wL5yL63I4D4h8FCBr2B6I4+gmQ2j6JA2MwWGxUCO9MDG7G9LID8rqIhye1+hJdgToms5001KCSudoXuuDbnniFLFHCrNVDLyr8D9YDZaU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460435; c=relaxed/simple; bh=AdZQZFBZ+Sq+Xs3+ioKoxuNwDqkD/CEsMpiPWsVgYCg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZWyPIdh0S8bkWNk22zTQPUrUdspmvhU3MqgfvKgZORHvRg7SaFXiCRZ8qpELzl2a+wGY4ojiib0p+iqffEEVamRjt/Fwf89hV7dDusFnEdaRm0/yBJ9+tyvikhMWLKbc2v7Q0vPaVmhsE7Jerc9+lXa1PmrsdWkjbmj2LtZ294A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--morbo.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=trGwKZ9H; arc=none smtp.client-ip=209.85.214.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--morbo.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="trGwKZ9H" Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2dcfed75f77so62046005ad.2 for ; Tue, 15 Sep 2026 01:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460391; x=1790065191; darn=lists.linux.dev; h=content-transfer-encoding:content-type:cc:to:from:subject :message-id:references:mime-version:in-reply-to:date:from:to:cc :subject:date:message-id:reply-to:content-type; bh=i189Z1372pvpafDRMVnLFn5IBf8O4Z3ONLFW1RCweBo=; b=trGwKZ9H3aEdfIruFRK5bthfhzzN8eDMYTBZ6ixkLGAiaGS5e9nNgbvYYL19YFOVNg cWoNKDm+3HGMAbr8ayC/b+X1ivPGMPMWspE4NQLvrJUYKDAjECzkrI2oWrRrNLTU75C9 DkbDH7wsj0B6+niVldBTMMF5+25VE/SZCqDW5oY07dTrh3o+pDTUuuk0rr8mgbooMdF5 MNOtrflYWePSHzMh0EFfnhdg0KWx21H2kXKE8CkK64xO0PgkMwMYYhaptKSK7DzCbS2a Knhjy5GMmVy+7L9zmM7ypMlJE4uddVQF91aqWODA8B9ICk3vlD4WNatrtj0ivYXtF45m YNvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460391; x=1790065191; h=content-transfer-encoding:content-type:cc:to:from:subject :message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=i189Z1372pvpafDRMVnLFn5IBf8O4Z3ONLFW1RCweBo=; b=XzN39Egy53XkDLK4caILBLd5HtoWzCpU7JepNnoKTQJIikLWDrmAEshlLbeat6zjFT EFMxEioCThO+4i7yT4enuJYdLrdnALUsBYtU+0wP1FdVELTokJje8ofKpgfHjHZYxJ15 axBtgCB7P8FWnUyDpNHhlnVOuD/qre1KUXHNplVtfSCBSiP2cJbXk4lj1FYjtYOFWI5N Fdw4gm7OiRnygrhOwLgxdE4kCxVHgwCVoM/v/lsjVRmOlPL0RFXmMcE1wXebNbjSpA4m rH8XJQ8U+LswAq1NgCB7DHIuIZxMfOLw0zSlZjqJRWP72P95wqDQdmcvEYHyQIXI+7CY QeMA== X-Forwarded-Encrypted: i=1; AKwUvBxSNN+k6d5V6HOR15UOD2FAbHYG/ucZtj/dk6eeF7KSlSt5fBJoq2Dwc6ahiAtcZQs9OGnFl3yIcHU=@lists.linux.dev X-Gm-Message-State: AFuF++nqaActjm+41rpVgLvqM4kyJ5F4I0PYXF1uEKeDlbXHMxXjv83h siDJYxbA8RI8Iha94KR9DJr02A4KrTyqvRsyEGHtAId56BLkWCsI3a+Hjac6pzu53JCkgBycXmr E X-Received: from plrd12.prod.google.com ([2002:a17:902:aa8c:b0:2db:8b6a:31a7]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:388d:b0:2dd:143:d5 with SMTP id d9443c01a7336-2dd6c75a396mr155065525ad.22.1789460390543; Tue, 15 Sep 2026 01:19:50 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:19 +0000 In-Reply-To: <20260915081910.4142719-1-morbo@google.com> Precedence: bulk X-Mailing-List: loongarch@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260915081910.4142719-1-morbo@google.com> X-Mailer: git-send-email 2.55.0.1032.g73a4cd73de-goog Message-ID: <20260915081910.4142719-3-morbo@google.com> Subject: [PATCH 02/28] sunrpc: Refactor rpc_sockaddr2uaddr() to use snprintf() instead of strlcat() From: Bill Wendling To: linux-kernel@vger.kernel.org Cc: Bill Wendling , codemender-patching+linux@google.com, Russell King , Huacai Chen , WANG Xuerui , Thomas Bogendoerfer , "James E.J. Bottomley" , Helge Deller , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Ian Abbott , H Hartley Sweeten , Tony Luck , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Matthew Brost , "=?UTF-8?q?Thomas=20Hellstr=C3=B6m?=" , Rodrigo Vivi , Dmitry Torokhov , Matthias Schwarzott , Mauro Carvalho Chehab , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Arend van Spriel , Rob Herring , Saravana Kannan , Krzysztof Kozlowski , Sylwester Nawrocki , Peter Griffin , Alim Akhtar , Linus Walleij , Anil Gurumurthy , Sudarsana Kalluru , "Martin K. Petersen" , Trond Myklebust , Anna Schumaker , Mike Marshall , Martin Brandenburg , Kees Cook , Jiri Pirko , Simon Horman , Chuck Lever , Jeff Layton , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Jaroslav Kysela , Takashi Iwai , Andrew Morton , "Mike Rapoport (Microsoft)" , Kanglong Wang , Tiezhu Yang , Qiang Ma , Randy Dunlap , Pengpeng Hou , Ard Biesheuvel , Breno Leitao , Thorsten Blum , Harshit Mogalapalli , Greg Kroah-Hartman , Lyude Paul , Ashutosh Desai , Imre Deak , Dmitry Baryshkov , Johan Hovold , Johannes Berg , Miri Korenblit , Alexander Stein , Cryolitia PukNgae , Jiaming Zhang , Will Porter , Cen Zhang , "=?UTF-8?q?C=C3=A1ssio=20Gabriel?=" , Rong Zhang , Arun Raghavan , linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linux-edac@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-input@vger.kernel.org, linux-media@vger.kernel.org, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, brcm80211@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-gpio@vger.kernel.org, linux-scsi@vger.kernel.org, linux-nfs@vger.kernel.org, devel@lists.orangefs.org, linux-hardening@vger.kernel.org, linux-sound@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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@google.com Assisted-by: CoPilot:3.5-sonnet [editor_update_file, shell_command_run] Signed-off-by: Bill Wendling --- Cc: Russell King Cc: Huacai Chen Cc: WANG Xuerui Cc: Thomas Bogendoerfer Cc: "James E.J. Bottomley" Cc: Helge Deller Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" Cc: Ian Abbott Cc: H Hartley Sweeten Cc: Tony Luck Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: David Airlie Cc: Simona Vetter Cc: Matthew Brost Cc: "Thomas Hellstr=C3=B6m" Cc: Rodrigo Vivi Cc: Dmitry Torokhov Cc: Matthias Schwarzott Cc: Mauro Carvalho Chehab Cc: Tony Nguyen Cc: Przemek Kitszel Cc: Andrew Lunn Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Arend van Spriel Cc: Rob Herring Cc: Saravana Kannan Cc: Krzysztof Kozlowski Cc: Sylwester Nawrocki Cc: Peter Griffin Cc: Alim Akhtar Cc: Linus Walleij Cc: Anil Gurumurthy Cc: Sudarsana Kalluru Cc: "Martin K. Petersen" Cc: Trond Myklebust Cc: Anna Schumaker Cc: Mike Marshall Cc: Martin Brandenburg Cc: Kees Cook Cc: Jiri Pirko Cc: Simon Horman Cc: Chuck Lever Cc: Jeff Layton Cc: NeilBrown Cc: Olga Kornievskaia Cc: Dai Ngo Cc: Tom Talpey Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Bill Wendling Cc: Andrew Morton Cc: "Mike Rapoport (Microsoft)" Cc: Kanglong Wang Cc: Tiezhu Yang Cc: Qiang Ma Cc: Randy Dunlap Cc: Pengpeng Hou Cc: Ard Biesheuvel Cc: Breno Leitao Cc: Thorsten Blum Cc: Harshit Mogalapalli Cc: Greg Kroah-Hartman Cc: Lyude Paul Cc: Ashutosh Desai Cc: Imre Deak Cc: Dmitry Baryshkov Cc: Johan Hovold Cc: Johannes Berg Cc: Miri Korenblit Cc: Alexander Stein Cc: Cryolitia PukNgae Cc: Jiaming Zhang Cc: Will Porter Cc: Cen Zhang Cc: "C=C3=A1ssio Gabriel" Cc: Rong Zhang Cc: Arun Raghavan Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: loongarch@lists.linux.dev Cc: linux-mips@vger.kernel.org Cc: linux-parisc@vger.kernel.org Cc: linux-edac@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Cc: linux-input@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: brcm80211@lists.linux.dev Cc: brcm80211-dev-list.pdl@broadcom.com Cc: devicetree@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-gpio@vger.kernel.org Cc: linux-scsi@vger.kernel.org Cc: linux-nfs@vger.kernel.org Cc: devel@lists.orangefs.org Cc: linux-hardening@vger.kernel.org Cc: linux-sound@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; =20 switch (sap->sa_family) { case AF_INET: - if (rpc_ntop4(sap, addrbuf, sizeof(addrbuf)) =3D=3D 0) + len =3D rpc_ntop4(sap, addrbuf, sizeof(addrbuf)); + if (len =3D=3D 0 || len >=3D sizeof(addrbuf)) return NULL; port =3D ntohs(((struct sockaddr_in *)sap)->sin_port); break; case AF_INET6: - if (rpc_ntop6_noscopeid(sap, addrbuf, sizeof(addrbuf)) =3D=3D 0) + len =3D rpc_ntop6_noscopeid(sap, addrbuf, sizeof(addrbuf)); + if (len =3D=3D 0 || len >=3D sizeof(addrbuf)) return NULL; port =3D ntohs(((struct sockaddr_in6 *)sap)->sin6_port); break; @@ -283,11 +285,8 @@ char *rpc_sockaddr2uaddr(const struct sockaddr *sap, g= fp_t gfp_flags) return NULL; } =20 - if (snprintf(portbuf, sizeof(portbuf), - ".%u.%u", port >> 8, port & 0xff) >=3D (int)sizeof(portbuf)) - return NULL; - - if (strlcat(addrbuf, portbuf, sizeof(addrbuf)) >=3D sizeof(addrbuf)) + if (snprintf(addrbuf + len, sizeof(addrbuf) - len, + ".%u.%u", port >> 8, port & 0xff) >=3D sizeof(addrbuf) - len) return NULL; =20 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); + --=20 2.55.0.1032.g73a4cd73de-goog