summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorTyler Hicks <tyhicks@linux.vnet.ibm.com>2011-03-09 11:49:13 -0600
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>2011-03-28 01:47:46 -0500
commit50f198ae16ac66508d4b8d5a40967a8507ad19ee (patch)
treecfd582a98eca9b93177fe6e417b82e7c4e345f45 /fs/ecryptfs
parent57db4e8d73ef2b5e94a3f412108dff2576670a8a (diff)
downloadop-kernel-dev-50f198ae16ac66508d4b8d5a40967a8507ad19ee.zip
op-kernel-dev-50f198ae16ac66508d4b8d5a40967a8507ad19ee.tar.gz
eCryptfs: Unlock page in write_begin error path
Unlock the page in error path of ecryptfs_write_begin(). This may happen, for example, if decryption fails while bring the page up-to-date. Cc: <stable@kernel.org> Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r--fs/ecryptfs/mmap.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
index 5e15013..6a44148 100644
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -381,6 +381,11 @@ static int ecryptfs_write_begin(struct file *file,
&& (pos != 0))
zero_user(page, 0, PAGE_CACHE_SIZE);
out:
+ if (unlikely(rc)) {
+ unlock_page(page);
+ page_cache_release(page);
+ *pagep = NULL;
+ }
return rc;
}
OpenPOWER on IntegriCloud