diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 2321cf51f48eda7cf460217d82f754873c465629..f949d4832dc45580f2811b5d41ce4797f3a7cd42 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -839,6 +839,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
 	struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
 	struct mm_struct *mm;
 	struct pt_regs *regs;
+	const int snapshot_randomize_va_space = READ_ONCE(randomize_va_space);
 
 	retval = -ENOEXEC;
 	/* First of all, some simple consistency checks */
@@ -1005,7 +1006,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
 	if (elf_read_implies_exec(*elf_ex, executable_stack))
 		current->personality |= READ_IMPLIES_EXEC;
 
-	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
+	if (!(current->personality & ADDR_NO_RANDOMIZE) && snapshot_randomize_va_space)
 		current->flags |= PF_RANDOMIZE;
 
 	setup_new_exec(bprm);
@@ -1299,7 +1300,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
 	mm->end_data = end_data;
 	mm->start_stack = bprm->p;
 
-	if ((current->flags & PF_RANDOMIZE) && (randomize_va_space > 1)) {
+	if ((current->flags & PF_RANDOMIZE) && (snapshot_randomize_va_space > 1)) {
 		/*
 		 * For architectures with ELF randomization, when executing
 		 * a loader directly (i.e. no interpreter listed in ELF