Commit e3a2a0d4 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Avi Kivity

anon_inodes: use fops->owner for module refcount

There is an imbalance for anonymous inodes. If the fops->owner field is set,
the module reference count of owner is decreases on release.
("filp_close" --> "__fput" ---> "fops_put")

On the other hand, anon_inode_getfd does not increase the module reference
count of owner. This causes two problems:

- if owner is set, the module refcount goes negative
- if owner is not set, the module can be unloaded while code is running

This patch changes anon_inode_getfd to be symmetric regarding fops->owner
handling.

I have checked all existing users of anon_inode_getfd. Noone sets fops->owner,
thats why nobody has seen the module refcount negative. The refcounting was
tested with a patched and unpatched KVM module.(see patch 2/2) I also did an
epoll_open/close test.
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarDavide Libenzi <davidel@xmailserver.org>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent e93353c9
...@@ -79,9 +79,12 @@ int anon_inode_getfd(const char *name, const struct file_operations *fops, ...@@ -79,9 +79,12 @@ int anon_inode_getfd(const char *name, const struct file_operations *fops,
if (IS_ERR(anon_inode_inode)) if (IS_ERR(anon_inode_inode))
return -ENODEV; return -ENODEV;
if (fops->owner && !try_module_get(fops->owner))
return -ENOENT;
error = get_unused_fd_flags(flags); error = get_unused_fd_flags(flags);
if (error < 0) if (error < 0)
return error; goto err_module;
fd = error; fd = error;
/* /*
...@@ -128,6 +131,8 @@ int anon_inode_getfd(const char *name, const struct file_operations *fops, ...@@ -128,6 +131,8 @@ int anon_inode_getfd(const char *name, const struct file_operations *fops,
dput(dentry); dput(dentry);
err_put_unused_fd: err_put_unused_fd:
put_unused_fd(fd); put_unused_fd(fd);
err_module:
module_put(fops->owner);
return error; return error;
} }
EXPORT_SYMBOL_GPL(anon_inode_getfd); EXPORT_SYMBOL_GPL(anon_inode_getfd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment