diff options
author | Christian Lamparter <chunkeey@googlemail.com> | 2016-09-17 15:43:04 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-21 06:13:34 -0400 |
commit | 9c4a45b17e094a090e96beb1138e34c2a10c6b8c (patch) | |
tree | 55fb1b8792d6f7d59baba421922f3a924d02ea5b | |
parent | 51b275a6fe5601834b717351d6cbdb89bd1f308b (diff) |
b43legacy: fix debugfs crash
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 <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>
-rw-r--r-- | drivers/net/wireless/broadcom/b43legacy/debugfs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/broadcom/b43legacy/debugfs.c b/drivers/net/wireless/broadcom/b43legacy/debugfs.c index 090910ea259e..82ef56ed7ca1 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, | |||
221 | goto out_unlock; | 221 | goto out_unlock; |
222 | } | 222 | } |
223 | 223 | ||
224 | dfops = container_of(file->f_op, struct b43legacy_debugfs_fops, fops); | 224 | dfops = container_of(debugfs_real_fops(file), |
225 | struct b43legacy_debugfs_fops, fops); | ||
225 | if (!dfops->read) { | 226 | if (!dfops->read) { |
226 | err = -ENOSYS; | 227 | err = -ENOSYS; |
227 | goto out_unlock; | 228 | goto out_unlock; |
@@ -287,7 +288,8 @@ static ssize_t b43legacy_debugfs_write(struct file *file, | |||
287 | goto out_unlock; | 288 | goto out_unlock; |
288 | } | 289 | } |
289 | 290 | ||
290 | dfops = container_of(file->f_op, struct b43legacy_debugfs_fops, fops); | 291 | dfops = container_of(debugfs_real_fops(file), |
292 | struct b43legacy_debugfs_fops, fops); | ||
291 | if (!dfops->write) { | 293 | if (!dfops->write) { |
292 | err = -ENOSYS; | 294 | err = -ENOSYS; |
293 | goto out_unlock; | 295 | goto out_unlock; |