From nobody Fri Dec 19 07:00:42 2025 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 71FCF14A625; Sun, 24 Mar 2024 22:57:05 +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=1711321026; cv=none; b=QQyXFvqE9tjZTHoyDIrPTvQwqD0zygSVMSUvC4O9JHWY3x0gHamkwwA4KuPMKrEo/QR/Nm3ptsXMQbDX3j061viRK9dKq6+YAGI+GR0N+TpYhQ73UNAZ7LjHUSX+iV34jeohVOxezX64yEbwLgbQM7NbR0H1GJ5YSIoqlBE0snM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321026; c=relaxed/simple; bh=dhKFxGipNUYb7+OZCcYXRa1jL6XDpWTD56tS1MNSVQM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nGeIC3G5x0Ogbf8VJjmb+Q4CSXvjVy79PFepbHcqZSe4+g0ZE/wKVN1TYf8iwrb06hTZ/lTRUsH7rB2wCZcyAnVRULqjGctVPnvH9XpQzxSUz/erBc2lkfmACWGOXcs1lme5rl7X2VnWdX7LzTy9mFVQuzL+q8yIFOOTlmSf63g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GH+D0EJU; 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="GH+D0EJU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96662C433F1; Sun, 24 Mar 2024 22:57:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321025; bh=dhKFxGipNUYb7+OZCcYXRa1jL6XDpWTD56tS1MNSVQM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GH+D0EJUBXDx+LxlF+VBo86W5jbRDyz450YDXQhuSySnii2kBmjRlIyoytt5hvCBH FVhjuNAjBs8LA9XhI08vhTcOv6JAd/YYw1h83bPo6qEFoBWYhUT/88+hR8vX7VrSIQ xSj7lgKnPvPdbWAFJqY4NcVdrYf4rRI5EtuBAge3zHJ7WKMvzfRVwURpiUlVitzyh5 13z0SHta77fBa0kZVb3XApaf6pqdYrTPJgJSMjs6Ki31UkHSJ7qPW+pDC/AT1sFfoX aY4dYI5n5smbrRW1HQX50AKQw0OF4P/ZnWD8jwiMerzegDilD8ZQElAFMZFDkIabFV 3KpAtGinDKWoQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christophe JAILLET , Benjamin Coddington , Trond Myklebust , Sasha Levin Subject: [PATCH 6.7 588/713] net: sunrpc: Fix an off by one in rpc_sockaddr2uaddr() Date: Sun, 24 Mar 2024 18:45:14 -0400 Message-ID: <20240324224720.1345309-589-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Christophe JAILLET [ Upstream commit d6f4de70f73a106986ee315d7d512539f2f3303a ] The intent is to check if the strings' are truncated or not. So, >=3D should be used instead of >, because strlcat() and snprintf() return the length of the output, excluding the trailing NULL. Fixes: a02d69261134 ("SUNRPC: Provide functions for managing universal addr= esses") Signed-off-by: Christophe JAILLET Reviewed-by: Benjamin Coddington Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- net/sunrpc/addr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c index d435bffc61999..97ff11973c493 100644 --- a/net/sunrpc/addr.c +++ b/net/sunrpc/addr.c @@ -284,10 +284,10 @@ char *rpc_sockaddr2uaddr(const struct sockaddr *sap, = gfp_t gfp_flags) } =20 if (snprintf(portbuf, sizeof(portbuf), - ".%u.%u", port >> 8, port & 0xff) > (int)sizeof(portbuf)) + ".%u.%u", port >> 8, port & 0xff) >=3D (int)sizeof(portbuf)) return NULL; =20 - if (strlcat(addrbuf, portbuf, sizeof(addrbuf)) > sizeof(addrbuf)) + if (strlcat(addrbuf, portbuf, sizeof(addrbuf)) >=3D sizeof(addrbuf)) return NULL; =20 return kstrdup(addrbuf, gfp_flags); --=20 2.43.0