]> git.hungrycats.org Git - linux/commitdiff
nfs/localio: must clear res.replen in nfs_local_read_done
authorNeilBrown <neilb@suse.de>
Fri, 8 Nov 2024 23:39:44 +0000 (18:39 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 13:03:03 +0000 (14:03 +0100)
[ Upstream commit 650703bc4ed3edf841e851c99ab8e7ba9e5262a3 ]

Otherwise memory corruption can occur due to NFSv3 LOCALIO reads
leaving garbage in res.replen:
- nfs3_read_done() copies that into server->read_hdrsize; from there
  nfs3_proc_read_setup() copies it to args.replen in new requests.
- nfs3_xdr_enc_read3args() passes that to rpc_prepare_reply_pages()
  which includes it in hdrsize for xdr_init_pages, so that rq_rcv_buf
  contains a ridiculous len.
- This is copied to rq_private_buf and xs_read_stream_request()
  eventually passes the kvec to sock_recvmsg() which receives incoming
  data into entirely the wrong place.

This is easily reproduced with NFSv3 LOCALIO that is servicing reads
when it is made to pivot back to using normal RPC.  This switch back
to using normal NFSv3 with RPC can occur for a few reasons but this
issue was exposed with a test that stops and then restarts the NFSv3
server while LOCALIO is performing heavy read IO.

Fixes: 70ba381e1a43 ("nfs: add LOCALIO support")
Reported-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: NeilBrown <neilb@suse.de>
Co-developed-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/nfs/localio.c

index 8f0ce82a677e1589092a30240d6e60a289d64a58..637528e6368ef73052f57b5ad44efa2cedcc1880 100644 (file)
@@ -354,6 +354,12 @@ nfs_local_read_done(struct nfs_local_kiocb *iocb, long status)
 
        nfs_local_pgio_done(hdr, status);
 
+       /*
+        * Must clear replen otherwise NFSv3 data corruption will occur
+        * if/when switching from LOCALIO back to using normal RPC.
+        */
+       hdr->res.replen = 0;
+
        if (hdr->res.count != hdr->args.count ||
            hdr->args.offset + hdr->res.count >= i_size_read(file_inode(filp)))
                hdr->res.eof = true;