diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-04-30 15:27:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 17:04:04 -0700 |
| commit | c1d025e22e0ef167a4589cf5a6b2a32bfef0472c (patch) | |
| tree | 1f1f2d4ef18082854a0b5e21cdac998d15a276a3 /fs/binfmt_elf.c | |
| parent | 2535e0d723e4d7723b030f39fb350e436bdb983f (diff) | |
| download | linux-3.10-c1d025e22e0ef167a4589cf5a6b2a32bfef0472c.tar.gz linux-3.10-c1d025e22e0ef167a4589cf5a6b2a32bfef0472c.tar.bz2 linux-3.10-c1d025e22e0ef167a4589cf5a6b2a32bfef0472c.zip | |
binfmt_elf: PIE: make PF_RANDOMIZE check comment more accurate
The comment I originally added in commit a3defbe5c337 ("binfmt_elf: fix
PIE execution with randomization disabled") is not really 100% accurate
-- sysctl is not the only way how PF_RANDOMIZE could be forcibly unset
in runtime.
Another option of course is direct modification of personality flags
(i.e. running through setarch wrapper).
Make the comment more explicit and accurate.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/binfmt_elf.c')
| -rw-r--r-- | fs/binfmt_elf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 86af964c242..e32344bdfab 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -803,7 +803,8 @@ static int load_elf_binary(struct linux_binprm *bprm) * follow the loader, and is not movable. */ #ifdef CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE /* Memory randomization might have been switched off - * in runtime via sysctl. + * in runtime via sysctl or explicit setting of + * personality flags. * If that is the case, retain the original non-zero * load_bias value in order to establish proper * non-randomized mappings. |