This patch fixes a crash that happens because b43legacy's
debugfs code expects file->f_op to be a pointer to its own
b43legacy_debugfs_fops struct. This is no longer the case
since commit 9fd4dcece43a
("debugfs: prevent access to possibly dead file_operations at file open")

Reviewed-by: Nicolai Stange <nicsta...@gmail.com>
Signed-off-by: Christian Lamparter <chunk...@gmail.com>
---
 drivers/net/wireless/broadcom/b43legacy/debugfs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/broadcom/b43legacy/debugfs.c 
b/drivers/net/wireless/broadcom/b43legacy/debugfs.c
index 090910e..82ef56e 100644
--- a/drivers/net/wireless/broadcom/b43legacy/debugfs.c
+++ b/drivers/net/wireless/broadcom/b43legacy/debugfs.c
@@ -221,7 +221,8 @@ static ssize_t b43legacy_debugfs_read(struct file *file, 
char __user *userbuf,
                goto out_unlock;
        }
 
-       dfops = container_of(file->f_op, struct b43legacy_debugfs_fops, fops);
+       dfops = container_of(debugfs_real_fops(file),
+                            struct b43legacy_debugfs_fops, fops);
        if (!dfops->read) {
                err = -ENOSYS;
                goto out_unlock;
@@ -287,7 +288,8 @@ static ssize_t b43legacy_debugfs_write(struct file *file,
                goto out_unlock;
        }
 
-       dfops = container_of(file->f_op, struct b43legacy_debugfs_fops, fops);
+       dfops = container_of(debugfs_real_fops(file),
+                            struct b43legacy_debugfs_fops, fops);
        if (!dfops->write) {
                err = -ENOSYS;
                goto out_unlock;
-- 
2.9.3


_______________________________________________
b43-dev mailing list
b43-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/b43-dev

Reply via email to