diff options
author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2014-09-22 16:39:31 -0400 |
---|---|---|
committer | Tyler Hicks <tyhicks@canonical.com> | 2014-10-06 17:54:50 -0400 |
commit | 0f9e2bf008a1b143973a01b52320eb66c20ac6ab (patch) | |
tree | 5bbdd526288d3c7e92dec46407f9341a5bf4e5dc /fs/ecryptfs | |
parent | 35425ea2492175fd39f6116481fe98b2b3ddd4ca (diff) |
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 7e405396dc05..e8e22535d9fb 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c | |||
@@ -190,12 +190,6 @@ ecryptfs_do_create(struct inode *directory_inode, | |||
190 | 190 | ||
191 | lower_dentry = ecryptfs_dentry_to_lower(ecryptfs_dentry); | 191 | lower_dentry = ecryptfs_dentry_to_lower(ecryptfs_dentry); |
192 | lower_dir_dentry = lock_parent(lower_dentry); | 192 | lower_dir_dentry = lock_parent(lower_dentry); |
193 | if (IS_ERR(lower_dir_dentry)) { | ||
194 | ecryptfs_printk(KERN_ERR, "Error locking directory of " | ||
195 | "dentry\n"); | ||
196 | inode = ERR_CAST(lower_dir_dentry); | ||
197 | goto out; | ||
198 | } | ||
199 | rc = vfs_create(lower_dir_dentry->d_inode, lower_dentry, mode, true); | 193 | rc = vfs_create(lower_dir_dentry->d_inode, lower_dentry, mode, true); |
200 | if (rc) { | 194 | if (rc) { |
201 | printk(KERN_ERR "%s: Failure to create dentry in lower fs; " | 195 | printk(KERN_ERR "%s: Failure to create dentry in lower fs; " |
@@ -213,7 +207,6 @@ ecryptfs_do_create(struct inode *directory_inode, | |||
213 | fsstack_copy_inode_size(directory_inode, lower_dir_dentry->d_inode); | 207 | fsstack_copy_inode_size(directory_inode, lower_dir_dentry->d_inode); |
214 | out_lock: | 208 | out_lock: |
215 | unlock_dir(lower_dir_dentry); | 209 | unlock_dir(lower_dir_dentry); |
216 | out: | ||
217 | return inode; | 210 | return inode; |
218 | } | 211 | } |
219 | 212 | ||