diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2015-03-30 12:29:19 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2015-03-30 12:29:19 +0530 |
| commit | 7136cc220e4412adece630c1d4dcbb2e061b099e (patch) | |
| tree | 5d464d2d3e953cdb896bc19c49c57862c7a23667 /fs/proc | |
| parent | 08d7f3c3b8814f54090922b2ccf35638faf82c07 (diff) | |
| parent | e42391cd048809d903291d07f86ed3934ce138e9 (diff) | |
Merge tag 'v4.0-rc6' into linaro-android-llct
Linux 4.0-rc6
* tag 'v4.0-rc6': (659 commits)
Linux 4.0-rc6
arm64: juno: Fix misleading name of UART reference clock
watchdog: imgpdc: Fix default heartbeat
watchdog: imgpdc: Fix probe NULL pointer dereference
watchdog: mtk_wdt: signedness bug in mtk_wdt_start()
drm/i915: Fixup legacy plane->crtc link for initial fb config
drm/i915: Fix atomic state when reusing the firmware fb
ALSA: hda - Add one more node in the EAPD supporting candidate list
clocksource/drivers/sun5i: Fix cpufreq interaction with sched_clock()
clocksource/drivers: Fix various !CONFIG_HAS_IOMEM build errors
drm/i915: Keep ring->active_list and ring->requests_list consistent
ALSA: hda_intel: apply the Seperate stream_tag for Sunrise Point
ARC: signal handling robustify
ARC: SA_SIGINFO ucontext regs off-by-one
mm: numa: mark huge PTEs young when clearing NUMA hinting faults
mm: numa: slow PTE scan rate if migration failures occur
mm: numa: preserve PTE write permissions across a NUMA hinting fault
mm: numa: group related processes based on VMA flags instead of page table flags
hfsplus: fix B-tree corruption after insertion at position 0
MAINTAINERS: add Jan as DMI/SMBIOS support maintainer
...
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/task_mmu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 4353705a0a7..f320aeeb2db 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1388,6 +1388,9 @@ out: static int pagemap_open(struct inode *inode, struct file *file) { + /* do not disclose physical addresses: attack vector */ + if (!capable(CAP_SYS_ADMIN)) + return -EPERM; pr_warn_once("Bits 55-60 of /proc/PID/pagemap entries are about " "to stop being page-shift some time soon. See the " "linux/Documentation/vm/pagemap.txt for details.\n"); |