]> git.karo-electronics.de Git - karo-tx-linux.git/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)
committerAK <andi@firstfloor.org>
Thu, 31 Mar 2011 18:58:50 +0000 (11:58 -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>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
fs/ecryptfs/mmap.c

index b1d82756544be763e9841a21a0c63c7bdc20db82..b530d9cd5bf0f49309be76699763d479b7ae7f0d 100644 (file)
@@ -368,6 +368,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;
 }