diff options
| author | David Howells <dhowells@redhat.com> | 2017-03-16 17:27:48 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2017-03-16 17:27:48 +0100 |
| commit | 6d06b0d25209c80e99c1e89700f1e09694a3766b (patch) | |
| tree | 1f9e637368a069518eaba7a918803e73c14c94d4 /fs/afs | |
| parent | afs: Don't set PG_error on local EINTR or ENOMEM when filling a page (diff) | |
| download | linux-6d06b0d25209c80e99c1e89700f1e09694a3766b.tar.xz linux-6d06b0d25209c80e99c1e89700f1e09694a3766b.zip | |
afs: Fix page leak in afs_write_begin()
afs_write_begin() leaks a ref and a lock on a page if afs_fill_page()
fails. Fix the leak by unlocking and releasing the page in the error path.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'fs/afs')
| -rw-r--r-- | fs/afs/write.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/afs/write.c b/fs/afs/write.c index f1450ea09406..6e13e96c3db0 100644 --- a/fs/afs/write.c +++ b/fs/afs/write.c @@ -154,12 +154,12 @@ int afs_write_begin(struct file *file, struct address_space *mapping, kfree(candidate); return -ENOMEM; } - *pagep = page; - /* page won't leak in error case: it eventually gets cleaned off LRU */ if (!PageUptodate(page) && len != PAGE_SIZE) { ret = afs_fill_page(vnode, key, pos & PAGE_MASK, PAGE_SIZE, page); if (ret < 0) { + unlock_page(page); + put_page(page); kfree(candidate); _leave(" = %d [prep]", ret); return ret; @@ -167,6 +167,9 @@ int afs_write_begin(struct file *file, struct address_space *mapping, SetPageUptodate(page); } + /* page won't leak in error case: it eventually gets cleaned off LRU */ + *pagep = page; + try_again: spin_lock(&vnode->writeback_lock); |