Commit 63b0ee12 authored Feb 15, 2019 by Trond Myklebust Committed by Greg Kroah-Hartman Mar 23, 2019

NFS: Fix an I/O request leakage in nfs_do_recoalesce



commit 4d91969ed4dbcefd0e78f77494f0cb8fada9048a upstream.

Whether we need to exit early, or just reprocess the list, we
must not lost track of the request which failed to get recoalesced.

Fixes: 03d5eb65 ("NFS: Fix a memory leak in nfs_do_recoalesce")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Cc: stable@vger.kernel.org # v4.0+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent be74fddc

fs/nfs/pagelist.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1093,7 +1093,6 @@ static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc)
		struct nfs_page *req;

		req = list_first_entry(&head, struct nfs_page, wb_list);
		nfs_list_remove_request(req);
		if (__nfs_pageio_add_request(desc, req))
		continue;
		if (desc->pg_error < 0) {