[RHEL7,COMMIT] fs/fuse kio: fix inode leak in pcs_fuse_submit()

Submitted by Konstantin Khorenko on May 31, 2019, 4:10 p.m.

Details

Message ID 201905311610.x4VGAfM6011721@finist-ce7.sw.ru
State New
Series "Series without cover letter"
Headers show

Commit Message

Konstantin Khorenko May 31, 2019, 4:10 p.m.
The commit is pushed to "branch-rh7-3.10.0-957.12.2.vz7.96.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-957.12.2.vz7.96.10
------>
commit 2317eb521bf6f585ad18075dd471383823fcd36a
Author: Pavel Butsykin <pbutsykin@virtuozzo.com>
Date:   Fri May 31 19:10:41 2019 +0300

    fs/fuse kio: fix inode leak in pcs_fuse_submit()
    
    In the case when already prepared request will be rejected due to
    FUSE_S_FAIL_IMMEDIATELY state in pcs_fuse_submit(), we will have inode
    leak that is referenced in pcs_fuse_prep_rw().
    
    Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
---
 fs/fuse/kio/pcs/pcs_fuse_kdirect.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/fuse/kio/pcs/pcs_fuse_kdirect.c b/fs/fuse/kio/pcs/pcs_fuse_kdirect.c
index 50c39c0ab8e7..8467ddb5707d 100644
--- a/fs/fuse/kio/pcs/pcs_fuse_kdirect.c
+++ b/fs/fuse/kio/pcs/pcs_fuse_kdirect.c
@@ -981,6 +981,9 @@  static int pcs_fuse_prep_rw(struct pcs_fuse_req *r, struct fuse_file *ff)
 	default:
 		BUG();
 	}
+
+	if (!kqueue_insert(di, ff, req))
+		return -EIO;
 	inode_dio_begin(req->io_inode);
 	return 0;
 fail:
@@ -1087,10 +1090,6 @@  static void pcs_fuse_submit(struct pcs_fuse_cluster *pfc, struct fuse_req *req,
 	return;
 
 submit:
-	if (!kqueue_insert(di, ff, req)) {
-		req->out.h.error = -EIO;
-		goto error;
-	}
 	ireq_process(ireq);
 }