diff options
| author |   Thomas Zimmermann <tzimmermann@suse.de> | 2020-07-28 15:35:50 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2020-07-28 15:35:50 +0200 |
| commit | f4a1692491b5cce8978cea19cb8946bc2c6f14bc (patch) | |
| tree | 1865126859b5b9d613c49113a5aaafc78f79b99b /mm/debug.c | |
| parent | drm: hold gem reference until object is no longer accessed (diff) | |
| parent | Merge branch 'linux-5.8' of git://github.com/skeggsb/linux into drm-fixes (diff) | |
| download | wireguard-linux-f4a1692491b5cce8978cea19cb8946bc2c6f14bc.tar.xz wireguard-linux-f4a1692491b5cce8978cea19cb8946bc2c6f14bc.zip | |
Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes
Updating drm-misc-fixes to v5.8-rc7.
Diffstat (limited to 'mm/debug.c')
| -rw-r--r-- | mm/debug.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/debug.c b/mm/debug.c index b5b1de8c71ac..4f376514744d 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -120,9 +120,9 @@ void __dump_page(struct page *page, const char *reason) * mapping can be invalid pointer and we don't want to crash * accessing it, so probe everything depending on it carefully */ - if (probe_kernel_read(&host, &mapping->host, + if (copy_from_kernel_nofault(&host, &mapping->host, sizeof(struct inode *)) || - probe_kernel_read(&a_ops, &mapping->a_ops, + copy_from_kernel_nofault(&a_ops, &mapping->a_ops, sizeof(struct address_space_operations *))) { pr_warn("failed to read mapping->host or a_ops, mapping not a valid kernel address?\n"); goto out_mapping; @@ -133,7 +133,7 @@ void __dump_page(struct page *page, const char *reason) goto out_mapping; } - if (probe_kernel_read(&dentry_first, + if (copy_from_kernel_nofault(&dentry_first, &host->i_dentry.first, sizeof(struct hlist_node *))) { pr_warn("mapping->a_ops:%ps with invalid mapping->host inode address %px\n", a_ops, host); @@ -146,7 +146,7 @@ void __dump_page(struct page *page, const char *reason) } dentry_ptr = container_of(dentry_first, struct dentry, d_u.d_alias); - if (probe_kernel_read(&dentry, dentry_ptr, + if (copy_from_kernel_nofault(&dentry, dentry_ptr, sizeof(struct dentry))) { pr_warn("mapping->aops:%ps with invalid mapping->host->i_dentry.first %px\n", a_ops, dentry_ptr); |