Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e270d84 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  fix cdev leak on O_PATH final fput()
parents 0bbf2119 60ed8cf7

fs/file_table.c

+3 −1
Original line number Diff line number Diff line
@@ -247,8 +247,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);