diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-30 10:58:32 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-30 10:58:32 +0800 |
| commit | 2dad587ec1dddf02a00d3b54156337a6dc79a752 (patch) | |
| tree | 00c8b9d215663f5b999cf4c7077bb79a05b3c5d0 /fs/proc | |
| parent | 5210951a4876a42856434546d2789838d3e35f34 (diff) | |
| parent | bdcec2cf3acd0d9ef24c653b722596f49ef6a040 (diff) | |
Merge tag 'v3.14.37' into linux-linaro-lsk-v3.14
This is the 3.14.37 stable release
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 c4b2646b6d7c..c2546717fc2b 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1227,6 +1227,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"); |