b43: fix debugfs crash
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 17 Sep 2016 19:43:03 +0000 (21:43 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 Sep 2016 10:13:34 +0000 (12:13 +0200)
This patch fixes a crash that happens because b43's
debugfs code expects file->f_op to be a pointer to
its own b43_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 <nicstange@gmail.com>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Cc: stable <stable@vger.kernel.org> # 4.7+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireless/broadcom/b43/debugfs.c

index b4bcd94aff6c2130b711aa74a266b92645d2b032..77046384dd8004c60493012d94fe5d82ba9ab667 100644 (file)
@@ -524,7 +524,8 @@ static ssize_t b43_debugfs_read(struct file *file, char __user *userbuf,
                goto out_unlock;
        }
 
-       dfops = container_of(file->f_op, struct b43_debugfs_fops, fops);
+       dfops = container_of(debugfs_real_fops(file),
+                            struct b43_debugfs_fops, fops);
        if (!dfops->read) {
                err = -ENOSYS;
                goto out_unlock;
@@ -585,7 +586,8 @@ static ssize_t b43_debugfs_write(struct file *file,
                goto out_unlock;
        }
 
-       dfops = container_of(file->f_op, struct b43_debugfs_fops, fops);
+       dfops = container_of(debugfs_real_fops(file),
+                            struct b43_debugfs_fops, fops);
        if (!dfops->write) {
                err = -ENOSYS;
                goto out_unlock;