]> git.hungrycats.org Git - linux/commitdiff
eCryptfs: Unlock page in write_begin error path
authorTyler Hicks <tyhicks@linux.vnet.ibm.com>
Wed, 9 Mar 2011 17:49:13 +0000 (11:49 -0600)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 14 Apr 2011 20:02:00 +0000 (13:02 -0700)
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>
fs/ecryptfs/mmap.c

index cc64fca89f8dc995f8ca5af82d135c053c6d59b2..eb9d9672ebd85a1beb6b9dde234cff9e5fc27816 100644 (file)
@@ -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;
 }