diff options
author | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:22:08 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:22:08 +0800 |
commit | 877c2196bf43e410b8b1a66c7bbf7d5cb98a9f41 (patch) | |
tree | f74b6a59cd223c470830b3e4f3e1b6a4270abc1a /fs/proc | |
parent | b95b6a6ddfae1513893676e444f585a106513688 (diff) | |
parent | 2dad587ec1dddf02a00d3b54156337a6dc79a752 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Conflicts:
net/netfilter/xt_socket.c
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 c93ebb4a34f7..0482e7cb1fb7 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1289,6 +1289,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"); |