diff options
| author | Andy Green <andy.green@linaro.org> | 2011-04-15 09:29:22 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-04-15 09:29:22 +0100 |
| commit | caa70ccf8cc719acb0540b558b4e075796778db8 (patch) | |
| tree | e8173307b04eca62168415be04e7800bdf011f80 /fs/ecryptfs/mmap.c | |
| parent | 56d667f87e81d15d43f264007322f1179ce1722e (diff) | |
| parent | 3ec10cd8b526c6b10170c2649002672ee2019e73 (diff) | |
Merge branch 'linux-linaro-2.6.38-master' into for-ubuntuu2
Diffstat (limited to 'fs/ecryptfs/mmap.c')
| -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 cc64fca89f8..eb9d9672ebd 100644 --- a/fs/ecryptfs/mmap.c +++ b/fs/ecryptfs/mmap.c @@ -374,6 +374,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; } |