]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commit
sunrpc: Fix misplaced barrier in call_decode
authorBaptiste Lepers <baptiste.lepers@gmail.com>
Sat, 1 May 2021 04:10:51 +0000 (14:10 +1000)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 18 Jun 2021 13:02:14 +0000 (15:02 +0200)
commite4235e1d72cdf72584d706ca744c0afe76bb818d
tree8a3606f82adaf9a0a456d3ddb7e6c5e80edb5b18
parentcf54a67738309e4e841f053ce731c99146d54afb
sunrpc: Fix misplaced barrier in call_decode

BugLink: https://bugs.launchpad.net/bugs/1930474
[ Upstream commit f8f7e0fb22b2e75be55f2f0c13e229e75b0eac07 ]

Fix a misplaced barrier in call_decode. The struct rpc_rqst is modified
as follows by xprt_complete_rqst:

req->rq_private_buf.len = copied;
/* Ensure all writes are done before we update */
/* req->rq_reply_bytes_recvd */
smp_wmb();
req->rq_reply_bytes_recvd = copied;

And currently read as follows by call_decode:

smp_rmb(); // misplaced
if (!req->rq_reply_bytes_recvd)
   goto out;
req->rq_rcv_buf.len = req->rq_private_buf.len;

This patch places the smp_rmb after the if to ensure that
rq_reply_bytes_recvd and rq_private_buf.len are read in order.

Fixes: 9ba828861c56a ("SUNRPC: Don't try to parse incomplete RPC messages")
Signed-off-by: Baptiste Lepers <baptiste.lepers@gmail.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
net/sunrpc/clnt.c