1 files changed, 3 insertions, 0 deletions

diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index 348f1341e1c8..f7e78d84fc01 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -325,6 +325,9 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
         int ret = 0;
         bool compat;
 
+        if (vdso_enabled == VDSO_DISABLED)
+                return 0;
+
         down_write(&mm->mmap_sem);
 
         /* Test compat mode once here, in case someone