From: Trond Myklebust Date: Thu, 29 May 2014 15:38:15 +0000 (-0400) Subject: NFS: Fix error handling in __nfs_pageio_add_request X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c1109558ae0f07a3434357cd26203bfc7adfea75;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git NFS: Fix error handling in __nfs_pageio_add_request Handle the case where nfs_create_request() returns an error. Reported-by: Dan Carpenter Signed-off-by: Trond Myklebust --- diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index fab78d13ee14..0b8446f1008d 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -947,6 +947,8 @@ static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc, subreq = nfs_create_request(req->wb_context, req->wb_page, subreq, pgbase, bytes_left); + if (IS_ERR(subreq)) + goto err_ptr; nfs_lock_request(subreq); subreq->wb_offset = offset; subreq->wb_index = req->wb_index; @@ -955,6 +957,10 @@ static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc, nfs_page_group_unlock(req); return 1; +err_ptr: + desc->pg_error = PTR_ERR(subreq); + nfs_page_group_unlock(req); + return 0; } static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc)