From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from flow-b8-smtp.messagingengine.com (flow-b8-smtp.messagingengine.com [202.12.124.143]) (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 3F16878F26; Sat, 27 Jun 2026 05:11:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.143 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782537104; cv=none; b=Pr05YahcNS/AGrcrMfezcwRdPsbAFv3YqM5Eb52762kO/R/6uBujjz/M/OnVsIYocBQzBXBEhRtBMtrTsS7BJ5Fne5caPnOmQW6YjdMhG9RFcnRwHj15Weva7fTbe3T1wUIa7fPhH+4N0qSgWTtoI1aWkDWDwAfMiSl9Ye3V/Ns= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782537104; c=relaxed/simple; bh=/VsB74zwCXVnz/0VFCi/dUI3gIBJbC3fxzQsz0T8RbE=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=iaKtbEyZQMXuuHASTb4leBJuTqAQFd1k9vuttRpIU4NJrUNzMzowCHCtjQUWNIS65e8jslr50Z6pDrf+XXi1D3YuWqAgea/t3WuR+R+6NgNyk/WQNLK+kWrcFtHBLrqvMqx7dGDCkeZO2qtTvg9jFgdz0QMY9eVnuO+dHKU7m/8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.org; spf=pass smtp.mailfrom=fastmail.org; dkim=pass (2048-bit key) header.d=fastmail.org header.i=@fastmail.org header.b=nm9ZQbNf; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=ieqWb76Z; arc=none smtp.client-ip=202.12.124.143 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastmail.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fastmail.org header.i=@fastmail.org header.b="nm9ZQbNf"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="ieqWb76Z" Received: from phl-compute-03.internal (phl-compute-03.internal [10.202.2.43]) by mailflow.stl.internal (Postfix) with ESMTP id 41786130024B; Sat, 27 Jun 2026 01:11:41 -0400 (EDT) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-03.internal (MEProxy); Sat, 27 Jun 2026 01:11:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.org; h= cc:cc:content-type:content-type:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to; s=fm1; t=1782537101; x=1782540701; bh=Yawowe8zx5C7uDvQPKakOCXbHdKhV7R9 9P2QeR1rAS8=; b=nm9ZQbNfHNYkv8cdFpySG0htUn3UCNbtS/+tFfURRLH2epJa D8HjhJi2+zQzPPtGTp5nNEMYwskgo9t6QjWspNz9bFEzOJGKndw339qVspvaWXHi l+mH96g+w0VFnrk/jiNulSOqY8tx4OEWBYfqMtQGhBVmMCM+WAgGHiBkRXrbqHfa D1VbAIclGnixLA1v/6S8c4eHEghMxem4SB1dInEVzLcU4BG96MlSKe+fsWXCIFLW bXxVnChg2II4VqLsb98Z5UTXoI5JozlrJGSJlNxNCX4r4iJB4Y109TnZifld51Y/ i8fPA+iz7SdXqGV3VYfjGfy91ugfo4Z1KQ2XNg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1782537101; x= 1782540701; bh=Yawowe8zx5C7uDvQPKakOCXbHdKhV7R99P2QeR1rAS8=; b=i eqWb76Z0YIJk5JqS+Sorj115qkFVnzZkwiEvqjjRMl1AX4+V9Agb9tJliqXVwZ0f ZndsFhvkJ/aqpekwv1SCDyAJqY6QSrrEd1otJfAj0ZYFlCtlC7J4KWG3zLjkXLfU OR3NLClJf/CMfGiBF3IFixmvGtFyKvduUKj9l0x2DTYgSa5loJ6FLePDj/FW4Wbz HwQlx+4NNUY8Lmn3E7v0NPGwrD9Jk00EvLNyH1nAwivKPz0kaTChziS9Nx8Q2ecB jReYP2YwRmFQi2g6+BKsCO4RkyD4YLtLctqej17FHQ4B3JxsnP4kOdS970/FbmDd r91NJ5iPyEWm9JOzX/3Uw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTEEJGas0eal+haqiznubm05y0BHQqqdCWlV5MG4ed30bCnDNmZnYMoGVqATwByXQ6 62jw/wpBiAVlhnZdzI8HoTE5bi+hevsp/u9zJ0oU5IglqMHIf8+isdmzspda8CkFRN0L5E RWIIOx+csNFY6hhAFCY1ilJo9VRvWdX7ksW7rcUSTy7enVhf+UqqVtDjkP2AE9NzXuuzPd NYyVzry+AlVHzQyFi7Ion7i/0ez3GQXUe/mfKlbIbvqd6ovxb2QKrh2kSKjpOZ5Vob7ica nVYyrny7nVBo34xbtlnSZUINwmAGdm2SAzfUClMB/O1IBG1k79l2D6swXv+NJBB0SXLNfl 1T9Qk/zyIz1rqLoqTyW6afxPNLRwtoXbNv3iFWpvECmWfvCDCtNHnaf8gf9CwHkqCwdTCN ur73CruIY+oA53abIUd4yyljMMzKll6R5R0HvDze0/Ze0MqeIGD3PkJwIaO9dx9mKX9lye c+9BNbWrg4cnT7ZOWcY+bNkhebh5pYjqXSJwL0rcAXK6zBYKttGZJ2Vxjr2zhFtFzKG9Xn 2nTm7KTnK4aNBG1WG8IBO/Soinow03DlWUdV+otnK0VxDX/YG82WNeQcsu6Qo6opqSEbmg NpYb0YlP2WVzeffweojx+5ZSd4yHzK3k/Bh1jZNQ5iB9hXhsCGtn07uFQWmw X-ME-Proxy: Feedback-ID: ib53e4b78:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 27 Jun 2026 01:11:40 -0400 (EDT) Date: Sat, 27 Jun 2026 00:11:37 -0500 From: Ian Bridges To: Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH] SUNRPC: Replace strlcat() with snprintf() in rpc_sockaddr2uaddr() Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In preparation for removing the deprecated strlcat() API[1], replace the snprintf()/strlcat() pair in rpc_sockaddr2uaddr() with a single snprintf() that appends the port suffix directly to the address buffer. rpc_ntop4() and rpc_ntop6_noscopeid() leave a NUL-terminated presentation address in addrbuf; the port is then formatted as ".p1.p2" and appended. Writing that suffix at addrbuf + strlen(addrbuf) with snprintf() yields the same universal address string as the separate portbuf/strlcat() step it replaces, so the intermediate portbuf is no longer needed. snprintf() returns the length it would have written excluding the NUL, so comparing it against the remaining buffer space preserves the existing truncation check that returns NULL. Link: https://github.com/KSPP/linux/issues/370 [1] Signed-off-by: Ian Bridges --- net/sunrpc/addr.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c index 97ff11973c49..c164ea214e6a 100644 --- a/net/sunrpc/addr.c +++ b/net/sunrpc/addr.c @@ -264,9 +264,9 @@ 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, avail; switch (sap->sa_family) { case AF_INET: @@ -283,11 +283,10 @@ 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)) + len = strlen(addrbuf); + avail = sizeof(addrbuf) - len; + if (snprintf(addrbuf + len, avail, ".%u.%u", + port >> 8, port & 0xff) >= avail) return NULL; return kstrdup(addrbuf, gfp_flags); -- 2.47.3