diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-06-14 12:43:54 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-06-20 12:42:57 +0100 |
| commit | 737326aa510b5f7d2f38ded739914a9d5e4e4cea (patch) | |
| tree | a52c62c3a616157f5c83231bdc7115e902e2bbc8 /fs | |
| parent | 06c35ef1fdf8d955684448683f7e48ac5f15ccfd (diff) | |
| download | linux-stable-737326aa510b5f7d2f38ded739914a9d5e4e4cea.tar.gz linux-stable-737326aa510b5f7d2f38ded739914a9d5e4e4cea.tar.bz2 linux-stable-737326aa510b5f7d2f38ded739914a9d5e4e4cea.zip | |
fs/proc: kcore: use kcore_list type to check for vmalloc/module address
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.
Reported-by: Tan Xiaojun <tanxiaojun@huawei.com>
Tested-by: Tan Xiaojun <tanxiaojun@huawei.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Laura Abbott <labbott@redhat.com>
Reviewed-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/kcore.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |