| From 2a04a541c4b4a319a21339770784fd15dfaee923 Mon Sep 17 00:00:00 2001 |
| From: Tyler Hicks <tyhicks@linux.vnet.ibm.com> |
| Date: Wed, 9 Mar 2011 11:49:13 -0600 |
| Subject: [PATCH] eCryptfs: Unlock page in write_begin error path |
| |
| commit 50f198ae16ac66508d4b8d5a40967a8507ad19ee upstream. |
| |
| 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. |
| |
| Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c |
| index 2ee9a3a..eb1a0c9 100644 |
| --- a/fs/ecryptfs/mmap.c |
| +++ b/fs/ecryptfs/mmap.c |
| @@ -377,6 +377,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; |
| } |
| |
| -- |
| 1.7.4.4 |
| |
