summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
77cfc07)
Upon writing to "remove" file, debugfs_remove_recursive() blocks while
holding rtnl_lock. This is because debugfs' file_ops callbacks are
executed in debugfs_use_file_*() context which prevents file removal.
Fix this by only flagging the device for removal and then do the cleanup
in file_ops.release callback which is executed out of that context.
Signed-off-by: Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>
struct list_head list;
struct net_device *dev1, *dev2;
struct dentry *debugfs;
struct list_head list;
struct net_device *dev1, *dev2;
struct dentry *debugfs;
+ /* First and before all, ensure that the debugfs file is removed
+ * to prevent dangling pointer in file->private_data */
+ debugfs_remove_recursive(tr->debugfs);
+
dev_put(tr->dev1);
dev_put(tr->dev2);
netdev_rx_handler_unregister(tr->dev1);
netdev_rx_handler_unregister(tr->dev2);
dev_put(tr->dev1);
dev_put(tr->dev2);
netdev_rx_handler_unregister(tr->dev1);
netdev_rx_handler_unregister(tr->dev2);
- debugfs_remove_recursive(tr->debugfs);
size_t count, loff_t *ppos)
{
struct trelay *tr = file->private_data;
size_t count, loff_t *ppos)
{
struct trelay *tr = file->private_data;
+ return count;
+}
+
+static int trelay_remove_release(struct inode *inode, struct file *file)
+{
+ struct trelay *tr, *tmp;
+
+ /* This is the only file op that is called outside debugfs_use_file_*()
+ * context which means that: (1) this file can be removed and
+ * (2) file->private_data may no longer be valid */
- ret = trelay_do_remove(tr);
+ list_for_each_entry_safe(tr, tmp, &trelay_devs, list)
+ if (tr->to_remove)
+ trelay_do_remove(tr);
- if (ret < 0)
- return ret;
-
- return count;
}
static const struct file_operations fops_remove = {
}
static const struct file_operations fops_remove = {
.open = trelay_open,
.write = trelay_remove_write,
.llseek = default_llseek,
.open = trelay_open,
.write = trelay_remove_write,
.llseek = default_llseek,
+ .release = trelay_remove_release,