tree a1199ea72666c8b9c6834e4f16909b4038ace7d1
parent 12df6462ef7d4b0ea8eab13af1b36172227782af
author Liu Jian <liujian56@huawei.com> 1731663484 +0800
committer Kevin Berry <kpberry@google.com> 1736551994 -0800

sunrpc: clear XPRT_SOCK_UPD_TIMEOUT when reset transport

[ Upstream commit 4db9ad82a6c823094da27de4825af693a3475d51 ]

Since transport->sock has been set to NULL during reset transport,
XPRT_SOCK_UPD_TIMEOUT also needs to be cleared. Otherwise, the
xs_tcp_set_socket_timeouts() may be triggered in xs_tcp_send_request()
to dereference the transport->sock that has been set to NULL.

BUG=b/388762412
TEST=presubmit
RELEASE_NOTE=Fixed CVE-2024-56688 in the Linux kernel.

cos-patch: security-moderate
Fixes: 7196dbb02ea0 ("SUNRPC: Allow changing of the TCP timeout parameters on the fly")
Change-Id: I78eaa76c17953feaabd68990b21785921e0b8507
Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com>
Signed-off-by: Liu Jian <liujian56@huawei.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kernel CVE Triage Automation <cloud-image-kernel-cve-triage-automation@prod.google.com>
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/90079
Reviewed-by: Kevin Berry <kpberry@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Shuo Yang <gshuoy@google.com>