diff options
author | Kees Cook <kees@outflux.net> | 2007-05-08 03:26:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:02 -0400 |
commit | 5096add84b9e96e2e0a9c72675c442fe5433388a (patch) | |
tree | f0444013cb7db32596d2b6febafc1ee4c2a4ea1f /fs/proc/base.c | |
parent | 4a1ccb5b1eff949a90ab830869cb23d6609c3d5f (diff) |
proc: maps protection
The /proc/pid/ "maps", "smaps", and "numa_maps" files contain sensitive
information about the memory location and usage of processes. Issues:
- maps should not be world-readable, especially if programs expect any
kind of ASLR protection from local attackers.
- maps cannot just be 0400 because "-D_FORTIFY_SOURCE=2 -O2" makes glibc
check the maps when %n is in a *printf call, and a setuid(getuid())
process wouldn't be able to read its own maps file. (For reference
see http://lkml.org/lkml/2006/1/22/150)
- a system-wide toggle is needed to allow prior behavior in the case of
non-root applications that depend on access to the maps contents.
This change implements a check using "ptrace_may_attach" before allowing
access to read the maps contents. To control this protection, the new knob
/proc/sys/kernel/maps_protect has been added, with corresponding updates to
the procfs documentation.
[akpm@linux-foundation.org: build fixes]
[akpm@linux-foundation.org: New sysctl numbers are old hat]
Signed-off-by: Kees Cook <kees@outflux.net>
Cc: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc/base.c')
-rw-r--r-- | fs/proc/base.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index a721acfd4fdc..17f7a7ee6c5e 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
@@ -64,6 +64,7 @@ | |||
64 | #include <linux/smp_lock.h> | 64 | #include <linux/smp_lock.h> |
65 | #include <linux/rcupdate.h> | 65 | #include <linux/rcupdate.h> |
66 | #include <linux/kallsyms.h> | 66 | #include <linux/kallsyms.h> |
67 | #include <linux/module.h> | ||
67 | #include <linux/mount.h> | 68 | #include <linux/mount.h> |
68 | #include <linux/security.h> | 69 | #include <linux/security.h> |
69 | #include <linux/ptrace.h> | 70 | #include <linux/ptrace.h> |
@@ -123,6 +124,9 @@ struct pid_entry { | |||
123 | NULL, &proc_info_file_operations, \ | 124 | NULL, &proc_info_file_operations, \ |
124 | { .proc_read = &proc_##OTYPE } ) | 125 | { .proc_read = &proc_##OTYPE } ) |
125 | 126 | ||
127 | int maps_protect; | ||
128 | EXPORT_SYMBOL(maps_protect); | ||
129 | |||
126 | static struct fs_struct *get_fs_struct(struct task_struct *task) | 130 | static struct fs_struct *get_fs_struct(struct task_struct *task) |
127 | { | 131 | { |
128 | struct fs_struct *fs; | 132 | struct fs_struct *fs; |