diff options
| author | Kees Cook <kees.cook@canonical.com> | 2011-02-11 19:29:44 -0800 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-02-14 09:23:20 +1000 |
| commit | 01e2f533a234dc62d16c0d3d4fb9d71cf1ce50c3 (patch) | |
| tree | 62a0e3ac022fc0f8e7abb1d45871be444206ae8a /drivers/gpu/drm/drm_info.c | |
| parent | 9fad321ac6bedd96f449754a1a25289ea1789a49 (diff) | |
| download | olio-linux-3.10-01e2f533a234dc62d16c0d3d4fb9d71cf1ce50c3.tar.xz olio-linux-3.10-01e2f533a234dc62d16c0d3d4fb9d71cf1ce50c3.zip | |
drm: do not leak kernel addresses via /proc/dri/*/vma
In the continuing effort to avoid kernel addresses leaking to unprivileged
users, this patch switches to %pK for /proc/dri/*/vma.
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_info.c')
| -rw-r--r-- | drivers/gpu/drm/drm_info.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c index 3cdbaf379bb..be9a9c07d15 100644 --- a/drivers/gpu/drm/drm_info.c +++ b/drivers/gpu/drm/drm_info.c @@ -283,17 +283,18 @@ int drm_vma_info(struct seq_file *m, void *data) #endif mutex_lock(&dev->struct_mutex); - seq_printf(m, "vma use count: %d, high_memory = %p, 0x%08llx\n", + seq_printf(m, "vma use count: %d, high_memory = %pK, 0x%pK\n", atomic_read(&dev->vma_count), - high_memory, (u64)virt_to_phys(high_memory)); + high_memory, (void *)virt_to_phys(high_memory)); list_for_each_entry(pt, &dev->vmalist, head) { vma = pt->vma; if (!vma) continue; seq_printf(m, - "\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx000", - pt->pid, vma->vm_start, vma->vm_end, + "\n%5d 0x%pK-0x%pK %c%c%c%c%c%c 0x%08lx000", + pt->pid, + (void *)vma->vm_start, (void *)vma->vm_end, vma->vm_flags & VM_READ ? 'r' : '-', vma->vm_flags & VM_WRITE ? 'w' : '-', vma->vm_flags & VM_EXEC ? 'x' : '-', |