[Devel,RHEL7,COMMIT] x86/vdso/prctl: Return size of vdso blob for ARCH_MAP_VDSO_32

Submitted by Konstantin Khorenko on May 31, 2017, 11:59 a.m.

Details

Message ID 201705311159.v4VBxr4q016651@finist_cl7.x64_64.work.ct
State New
Series "x86: C/R for ia32 tasks"
Headers show

Commit Message

Konstantin Khorenko May 31, 2017, 11:59 a.m.
The commit is pushed to "branch-rh7-3.10.0-514.16.1.vz7.32.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.16.1.vz7.32.5
------>
commit 34197f07cead355b0630360a3012d0689c11956b
Author: Dmitry Safonov <dsafonov@virtuozzo.com>
Date:   Wed May 31 15:59:53 2017 +0400

    x86/vdso/prctl: Return size of vdso blob for ARCH_MAP_VDSO_32
    
    Adjust to mainstream API.
    
    Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
---
 arch/x86/vdso/vdso32-setup.c | 2 ++
 1 file changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index 776face..81a16c8 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -560,6 +560,8 @@  int do_map_compat_vdso(unsigned long req_addr)
 	ret = __arch_setup_additional_pages(req_addr, compat);
 	if (ret)
 		current->mm->context.vdso = NULL;
+	else
+		ret = ARRAY_SIZE(vdso32_pages) * PAGE_SIZE;
 
 up_fail:
 	up_write(&mm->mmap_sem);