summaryrefslogtreecommitdiff
path: root/fs/file_table.c
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2011-03-16 20:17:54 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2011-03-16 23:18:39 +0300
commit60ed8cf78f886753e454b671841c0a3a0e55e915 (patch)
treee37357fd9ca36362e38525c51944a0d4172b5308 /fs/file_table.c
parentbab1d9444d9a147f1dc3478dd06c16f490227f3e (diff)
downloadlinux-60ed8cf78f886753e454b671841c0a3a0e55e915.tar.xz
fix cdev leak on O_PATH final fput()
__fput doesn't need a cdev_put() for O_PATH handles. Signed-off-by: mszeredi@suse.cz Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/file_table.c')
-rw-r--r--fs/file_table.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/file_table.c b/fs/file_table.c
index 74a9544ac770..db30d3497f1a 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -246,8 +246,10 @@ static void __fput(struct file *file)
file->f_op->release(inode, file);
security_file_free(file);
ima_file_free(file);
- if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL))
+ if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL &&
+ !(file->f_mode & FMODE_PATH))) {
cdev_put(inode->i_cdev);
+ }
fops_put(file->f_op);
put_pid(file->f_owner.pid);
file_sb_list_del(file);