diff options
| author | Tyler Hicks <tyhicks@linux.vnet.ibm.com> | 2011-03-09 11:49:13 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-14 16:53:21 -0700 |
| commit | b6ec40927010e25d9fc5e432d4ca963f9e1fb31a (patch) | |
| tree | ca4e2869c8871583e160f85f5219f85e59d4cbf3 /fs/ecryptfs | |
| parent | 40001773632081282f51a4cf582e0bb7fee7c225 (diff) | |
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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/ecryptfs')
| -rw-r--r-- | fs/ecryptfs/mmap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c index df4ce99d0597..8721a89d8c76 100644 --- a/fs/ecryptfs/mmap.c +++ b/fs/ecryptfs/mmap.c @@ -372,6 +372,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; } |