UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFS: Fix a use after free in nfs_direct_join_group() 

Be more careful when tearing down the subrequests of an O_DIRECT write
as part of a retransmission.

Reported-by: Chris Mason <clm@fb.com>
Fixes: ed5d588fe4 ("NFS: Try to join page groups before an O_DIRECT retransmission")
Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2023-08-08 21:17:11 -04:00
parent 1cbc11aaa0
commit be2fd1560e
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs/nfs/direct.c
View File

@ -472,20 +472,26 @@ out:
return result; return result;
} }
static void static void nfs_direct_join_group(struct list_head *list, struct inode *inode)
nfs_direct_join_group(struct list_head *list, struct inode *inode)
{ {
struct nfs_page *req, *next; struct nfs_page *req, *subreq;
list_for_each_entry(req, list, wb_list) { list_for_each_entry(req, list, wb_list) {
if (req->wb_head != req || req->wb_this_page == req) if (req->wb_head != req)
continue; continue;
for (next = req->wb_this_page; subreq = req->wb_this_page;
next != req->wb_head; if (subreq == req)
next = next->wb_this_page) { continue;
nfs_list_remove_request(next); do {
nfs_release_request(next); /*
* Remove subrequests from this list before freeing
* them in the call to nfs_join_page_group().
*/
if (!list_empty(&subreq->wb_list)) {
nfs_list_remove_request(subreq);
nfs_release_request(subreq);
} }
} while ((subreq = subreq->wb_this_page) != req);
nfs_join_page_group(req, inode); nfs_join_page_group(req, inode);
} }
} }