From: Kinglong Mee <kinglongmee@gmail.com>
To: "J. Bruce Fields" <bfields@fieldses.org>,
"linux-nfs@vger.kernel.org" <linux-nfs@vger.kernel.org>
Cc: Christoph Hellwig <hch@infradead.org>, kinglongmee@gmail.com
Subject: [PATCH 1/5] nfsd: Fix a file leak of ls_file if nfsd4_layout_setlease fail
Date: Fri, 03 Jul 2015 19:32:07 +0800 [thread overview]
Message-ID: <559672B7.4010802@gmail.com> (raw)
If nfsd4_layout_setlease fail, nfsd will not put ls->ls_file.
Fix commit c5c707f96f "nfsd: implement pNFS layout recalls".
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
---
fs/nfsd/nfs4layouts.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
index 6904213..367a65a 100644
--- a/fs/nfsd/nfs4layouts.c
+++ b/fs/nfsd/nfs4layouts.c
@@ -212,8 +212,7 @@ nfsd4_alloc_layout_stateid(struct nfsd4_compound_state *cstate,
BUG_ON(!ls->ls_file);
if (nfsd4_layout_setlease(ls)) {
- put_nfs4_file(fp);
- kmem_cache_free(nfs4_layout_stateid_cache, ls);
+ nfs4_put_stid(stp);
return NULL;
}
--
2.4.3
next reply other threads:[~2015-07-03 11:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-03 11:32 Kinglong Mee [this message]
2015-07-03 11:34 ` [PATCH 2/5] nfsd: Drop including client's header file nfs_fs.h Kinglong Mee
2015-07-03 11:36 ` [PATCH 3/5] nfsd: Remove duplicate define of IDMAP_NAMESZ/IDMAP_TYPE_xx Kinglong Mee
2015-07-03 11:38 ` [PATCH 4/5] nfsd: Check stateid generation in nfsd4_lookup_stateid() Kinglong Mee
2015-07-08 21:42 ` J. Bruce Fields
2015-07-09 10:51 ` Kinglong Mee
2015-07-03 11:39 ` [PATCH 5/5] nfsd: Add macro NFS_ACL_MASK for ACL Kinglong Mee
2015-07-08 21:45 ` J. Bruce Fields
2015-07-08 21:30 ` [PATCH 1/5] nfsd: Fix a file leak of ls_file if nfsd4_layout_setlease fail J. Bruce Fields
2015-07-09 8:12 ` Christoph Hellwig
2015-07-09 9:31 ` Kinglong Mee
2015-07-09 9:38 ` [PATCH v2] " Kinglong Mee
2015-07-09 16:19 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=559672B7.4010802@gmail.com \
--to=kinglongmee@gmail.com \
--cc=bfields@fieldses.org \
--cc=hch@infradead.org \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.