diff --git a/[refs] b/[refs] index 48f55cb8be8f..4435f2c4cd50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8804d39462dc019ae9d1a6e4d45512e9dfec2bf +refs/heads/master: 96a8e13ed44e380fc2bb6c711d74d5ba698c00b2 diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c index da94a6f05df3..fd9234379e8d 100644 --- a/trunk/fs/exec.c +++ b/trunk/fs/exec.c @@ -610,7 +610,7 @@ int setup_arg_pages(struct linux_binprm *bprm, bprm->exec -= stack_shift; down_write(&mm->mmap_sem); - vm_flags = vma->vm_flags; + vm_flags = VM_STACK_FLAGS; /* * Adjust stack execute permissions; explicitly enable for