| Message ID | 20170608194139.9250-2-ard.biesheuvel@linaro.org |
|---|---|
| State | Accepted |
| Commit | 737326aa510b5f7d2f38ded739914a9d5e4e4cea |
| Headers | show |
| Series | arm64: fix crash when reading /proc/kcore | expand |
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index 4ee55274f155..45629f4b5402 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c @@ -504,7 +504,7 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) if (&m->list == &kclist_head) { if (clear_user(buffer, tsz)) return -EFAULT; - } else if (is_vmalloc_or_module_addr((void *)start)) { + } else if (m->type == KCORE_VMALLOC) { vread(buf, (char *)start, tsz); /* we have to zero-fill user buffer even if no read */ if (copy_to_user(buffer, buf, tsz))
Instead of passing each start address into is_vmalloc_or_module_addr() to decide whether it falls into either the VMALLOC or the MODULES region, we can simply check the type field of the current kcore_list entry, since it will be set to KCORE_VMALLOC based on exactly the same conditions. As a bonus, when reading the KCORE_TEXT region on architectures that have one, this will avoid using vread() on the region if it happens to intersect with a KCORE_VMALLOC region. This is due the fact that the KCORE_TEXT region is the first one to be added to the kcore region list. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- fs/proc/kcore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.3