Commit 8445b7eb authored by David Howells's avatar David Howells Committed by Kleber Sacilotto de Souza

afs: Fix page leak in afs_write_begin()

BugLink: http://bugs.launchpad.net/bugs/1745052

[ Upstream commit 6d06b0d2 ]

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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent a7493ba8
...@@ -148,12 +148,12 @@ int afs_write_begin(struct file *file, struct address_space *mapping, ...@@ -148,12 +148,12 @@ int afs_write_begin(struct file *file, struct address_space *mapping,
kfree(candidate); kfree(candidate);
return -ENOMEM; return -ENOMEM;
} }
*pagep = page;
/* page won't leak in error case: it eventually gets cleaned off LRU */
if (!PageUptodate(page) && len != PAGE_CACHE_SIZE) { if (!PageUptodate(page) && len != PAGE_CACHE_SIZE) {
ret = afs_fill_page(vnode, key, index << PAGE_CACHE_SHIFT, page); ret = afs_fill_page(vnode, key, index << PAGE_CACHE_SHIFT, page);
if (ret < 0) { if (ret < 0) {
unlock_page(page);
put_page(page);
kfree(candidate); kfree(candidate);
_leave(" = %d [prep]", ret); _leave(" = %d [prep]", ret);
return ret; return ret;
...@@ -161,6 +161,9 @@ int afs_write_begin(struct file *file, struct address_space *mapping, ...@@ -161,6 +161,9 @@ int afs_write_begin(struct file *file, struct address_space *mapping,
SetPageUptodate(page); SetPageUptodate(page);
} }
/* page won't leak in error case: it eventually gets cleaned off LRU */
*pagep = page;
try_again: try_again:
spin_lock(&vnode->writeback_lock); spin_lock(&vnode->writeback_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment