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 D750B2820DE; Mon, 5 May 2025 22:15:25 +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=1746483326; cv=none; b=GtybR8HLUSLDzqt6M5CC63eFHWm2R8IZNbjoYDorki9RDdNBW887u54ZWD3R11coYZ3ilj41NP7gZLHmNTE6x4s+sHQCFU+lSdawIxsBP0RzajHLgq8ABCmOaMXeAlvSW6AlL4IDIwcQaH2d87gFQ6qBF7HKoafRT/D1n0uNnl0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746483326; c=relaxed/simple; bh=BYmx1SoM6cZjl6yYUpyus6wm6SDYezgd/kLQ4Fl4VDg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fwWybv2rDiQ/hXiUkfm06xg07j1AFeOAj8pyDZuEM8ruJ9aa2Ba3wM6wuvjBs8MFpDgiSgTLeyYL+qba8q6bpE4BXqu9lnkVT7Btc/PnjIpohOzTYMLvsTti7QDUjUweWqKucSmvlLj3u8pvSvjtT5AuX2WpALKyhxcw5HDqAyA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RRMQnFns; 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="RRMQnFns" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38994C4CEF1; Mon, 5 May 2025 22:15:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746483325; bh=BYmx1SoM6cZjl6yYUpyus6wm6SDYezgd/kLQ4Fl4VDg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RRMQnFnsqqEM5O4mSHDjdmSkYMFYiCQ0oWZTZv0XgV/iSiczI9nGZLgc4lOl9pase sk7vxAwULU2m+rnRv/SadqxauCAcCWzlCpHanPz/ylEH2J9U5nBLLiF4zM8zISitMw Yf94mNvOsJ1Hc/iMomN7Bj8k7yLsKEBwT6uSAGrv8wGjGm1AyzyrqXZSrE4XsBKQrb yFR+mHSv+7qfs1suS8nLU4eo8jCy4bWtObbftXus9nisyq9bFNR1nSQniXj4CzM5TL S/DH9gXBEyfyfo6kBkAd43E4gJgDIQcZDcMWabf3PpZ1V6t5CIShuxDYAbhzO8139N YeZ/pGMF5i1Pw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Trond Myklebust , Jeff Layton , Benjamin Coddington , Sasha Levin , chuck.lever@oracle.com, trondmy@kernel.org, anna@kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-nfs@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.14 034/642] SUNRPC: rpcbind should never reset the port to the value '0' Date: Mon, 5 May 2025 18:04:10 -0400 Message-Id: <20250505221419.2672473-34-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505221419.2672473-1-sashal@kernel.org> References: <20250505221419.2672473-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14.5 Content-Transfer-Encoding: 8bit From: Trond Myklebust [ Upstream commit 214c13e380ad7636631279f426387f9c4e3c14d9 ] If we already had a valid port number for the RPC service, then we should not allow the rpcbind client to set it to the invalid value '0'. Reviewed-by: Jeff Layton Reviewed-by: Benjamin Coddington Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- net/sunrpc/rpcb_clnt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c index 102c3818bc54d..53bcca365fb1c 100644 --- a/net/sunrpc/rpcb_clnt.c +++ b/net/sunrpc/rpcb_clnt.c @@ -820,9 +820,10 @@ static void rpcb_getport_done(struct rpc_task *child, void *data) } trace_rpcb_setport(child, map->r_status, map->r_port); - xprt->ops->set_port(xprt, map->r_port); - if (map->r_port) + if (map->r_port) { + xprt->ops->set_port(xprt, map->r_port); xprt_set_bound(xprt); + } } /* -- 2.39.5