binfmt_elf: PIE: make PF_RANDOMIZE check comment more accurate
authorJiri Kosina <jkosina@suse.cz>
Tue, 30 Apr 2013 22:27:45 +0000 (15:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 May 2013 00:04:04 +0000 (17:04 -0700)
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>
fs/binfmt_elf.c

index 86af964c2425d7077467bf54eaecde3d2d4c4911..e32344bdfab126ded1a67b4ed18fb79dead006d1 100644 (file)
@@ -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.