Commit 73d7c33e authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds

kcore: /proc/kcore should use vread

/proc/kcore has its own routine to access vmallc area.  It can be replaced
with vread().  And by this, /proc/kcore can do safe access to vmalloc
Signed-off-by: default avatarKAMEZAWA Hiroyuki <>
Cc: WANG Cong <>
Cc: Mike Smith <>
Cc: Nick Piggin <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent d0107eb0
...@@ -328,43 +328,12 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) ...@@ -328,43 +328,12 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
return -EFAULT; return -EFAULT;
} else if (is_vmalloc_addr((void *)start)) { } else if (is_vmalloc_addr((void *)start)) {
char * elf_buf; char * elf_buf;
struct vm_struct *m;
unsigned long curstart = start;
unsigned long cursize = tsz;
elf_buf = kzalloc(tsz, GFP_KERNEL); elf_buf = kzalloc(tsz, GFP_KERNEL);
if (!elf_buf) if (!elf_buf)
return -ENOMEM; return -ENOMEM;
vread(elf_buf, (char *)start, tsz);
read_lock(&vmlist_lock); /* we have to zero-fill user buffer even if no read */
for (m=vmlist; m && cursize; m=m->next) {
unsigned long vmstart;
unsigned long vmsize;
unsigned long msize = m->size - PAGE_SIZE;
if (((unsigned long)m->addr + msize) <
if ((unsigned long)m->addr > (curstart +
vmstart = (curstart < (unsigned long)m->addr ?
(unsigned long)m->addr : curstart);
if (((unsigned long)m->addr + msize) >
(curstart + cursize))
vmsize = curstart + cursize - vmstart;
vmsize = (unsigned long)m->addr +
msize - vmstart;
curstart = vmstart + vmsize;
cursize -= vmsize;
/* don't dump ioremap'd stuff! (TA) */
if (m->flags & VM_IOREMAP)
memcpy(elf_buf + (vmstart - start),
(char *)vmstart, vmsize);
if (copy_to_user(buffer, elf_buf, tsz)) { if (copy_to_user(buffer, elf_buf, tsz)) {
kfree(elf_buf); kfree(elf_buf);
return -EFAULT; return -EFAULT;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment