* [PATCH] x86, vdso: fix size of get_unmapped_area()
@ 2014-03-23 16:38 Stefani Seibold
2014-03-24 17:04 ` [tip:x86/vdso] x86, vdso: Fix " tip-bot for Stefani Seibold
0 siblings, 1 reply; 2+ messages in thread
From: Stefani Seibold @ 2014-03-23 16:38 UTC (permalink / raw)
To: gregkh, linux-kernel, x86, tglx, mingo, hpa, ak, aarcange,
john.stultz, luto, xemul, gorcunov, andriy.shevchenko
Cc: Martin.Runge, Andreas.Brief, Stefani Seibold
The size of the reserved memory for a 32 bit vdso must be the size of the
32 bit vDSO in pages + HPET page + VVAR page.
One page is not enough for this. Grrrr.... silly copy and paste bug,
was right in previous patch.
The patch is against 3c1b63b9e4862fb16352a0646439c2dd6d9e0e5c
Signed-off-by: Stefani Seibold <stefani@seibold.net>
---
arch/x86/vdso/vdso32-setup.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index 791c1cb..0034898 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -165,12 +165,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
down_write(&mm->mmap_sem);
- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
+ addr = get_unmapped_area(NULL, 0, vdso32_size + VDSO_OFFSET(VDSO_PREV_PAGES), 0, 0);
if (IS_ERR_VALUE(addr)) {
ret = addr;
goto up_fail;
}
+ addr += VDSO_OFFSET(VDSO_PREV_PAGES);
+
current->mm->context.vdso = (void *)addr;
/*
--
1.9.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:x86/vdso] x86, vdso: Fix size of get_unmapped_area()
2014-03-23 16:38 [PATCH] x86, vdso: fix size of get_unmapped_area() Stefani Seibold
@ 2014-03-24 17:04 ` tip-bot for Stefani Seibold
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Stefani Seibold @ 2014-03-24 17:04 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, luto, hpa, mingo, stefani, tglx, hpa
Commit-ID: 645a387ecbdb4aa78c8451a66416340616134537
Gitweb: http://git.kernel.org/tip/645a387ecbdb4aa78c8451a66416340616134537
Author: Stefani Seibold <stefani@seibold.net>
AuthorDate: Sun, 23 Mar 2014 17:38:14 +0100
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Mon, 24 Mar 2014 09:31:23 -0700
x86, vdso: Fix size of get_unmapped_area()
The size of the reserved memory for a 32 bit vdso must be the size of the
32 bit vDSO in pages + HPET page + VVAR page.
One page is not enough for this. Grrrr.... silly copy and paste bug,
was right in previous patch.
Signed-off-by: Stefani Seibold <stefani@seibold.net>
Cc: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/1395592694-20571-1-git-send-email-stefani@seibold.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/vdso/vdso32-setup.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index 791c1cb..0034898 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -165,12 +165,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
down_write(&mm->mmap_sem);
- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
+ addr = get_unmapped_area(NULL, 0, vdso32_size + VDSO_OFFSET(VDSO_PREV_PAGES), 0, 0);
if (IS_ERR_VALUE(addr)) {
ret = addr;
goto up_fail;
}
+ addr += VDSO_OFFSET(VDSO_PREV_PAGES);
+
current->mm->context.vdso = (void *)addr;
/*
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-24 17:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-23 16:38 [PATCH] x86, vdso: fix size of get_unmapped_area() Stefani Seibold
2014-03-24 17:04 ` [tip:x86/vdso] x86, vdso: Fix " tip-bot for Stefani Seibold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome