diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2014-09-23 00:39:31 +0400 |
|---|---|---|
| committer | Tyler Hicks <tyhicks@canonical.com> | 2014-10-06 16:54:50 -0500 |
| commit | 0f9e2bf008a1b143973a01b52320eb66c20ac6ab (patch) | |
| tree | 5bbdd526288d3c7e92dec46407f9341a5bf4e5dc /fs/ecryptfs | |
| parent | 35425ea2492175fd39f6116481fe98b2b3ddd4ca (diff) | |
| download | op-kernel-dev-0f9e2bf008a1b143973a01b52320eb66c20ac6ab.zip op-kernel-dev-0f9e2bf008a1b143973a01b52320eb66c20ac6ab.tar.gz | |
ecryptfs: remove unneeded buggy code in ecryptfs_do_create()
There is a bug in error handling of lock_parent() in ecryptfs_do_create():
lock_parent() acquries mutex even if dget_parent() fails, so mutex should be unlocked anyway.
But dget_parent() does not fail, so the patch just removes unneeded buggy code.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Diffstat (limited to 'fs/ecryptfs')
| -rw-r--r-- | fs/ecryptfs/inode.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index 7e40539..e8e22535 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -190,12 +190,6 @@ ecryptfs_do_create(struct inode *directory_inode, lower_dentry = ecryptfs_dentry_to_lower(ecryptfs_dentry); lower_dir_dentry = lock_parent(lower_dentry); - if (IS_ERR(lower_dir_dentry)) { - ecryptfs_printk(KERN_ERR, "Error locking directory of " - "dentry\n"); - inode = ERR_CAST(lower_dir_dentry); - goto out; - } rc = vfs_create(lower_dir_dentry->d_inode, lower_dentry, mode, true); if (rc) { printk(KERN_ERR "%s: Failure to create dentry in lower fs; " @@ -213,7 +207,6 @@ ecryptfs_do_create(struct inode *directory_inode, fsstack_copy_inode_size(directory_inode, lower_dir_dentry->d_inode); out_lock: unlock_dir(lower_dir_dentry); -out: return inode; } |
