diff options
| author | Jeff Layton <jlayton@poochiereds.net> | 2015-07-10 15:58:42 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-07-28 09:07:02 -0400 |
| commit | 3471648a7569512e10f154cdfe5076c341a5c099 (patch) | |
| tree | ebd3e8c3ddfa687b9d1e4c703440f4bcf2d3058a /fs | |
| parent | f580dd042823294b5b548e0f8bf1ba7a4b114fa5 (diff) | |
| download | lwn-3471648a7569512e10f154cdfe5076c341a5c099.tar.gz lwn-3471648a7569512e10f154cdfe5076c341a5c099.zip | |
nfs: plug memory leak when ->prepare_layoutcommit fails
"data" is currently leaked when the prepare_layoutcommit operation
returns an error. Put the cred before taking the spinlock in that
case, take the lock and then goto out_unlock which will drop the
lock and then free "data".
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/pnfs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 18aa3b7962eb..70bf706b1090 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -2221,13 +2221,12 @@ pnfs_layoutcommit_inode(struct inode *inode, bool sync) if (ld->prepare_layoutcommit) { status = ld->prepare_layoutcommit(&data->args); if (status) { + put_rpccred(data->cred); spin_lock(&inode->i_lock); set_bit(NFS_INO_LAYOUTCOMMIT, &nfsi->flags); if (end_pos > nfsi->layout->plh_lwb) nfsi->layout->plh_lwb = end_pos; - spin_unlock(&inode->i_lock); - put_rpccred(data->cred); - goto clear_layoutcommitting; + goto out_unlock; } } |