Commit b088fe35 authored by Guilherme Giacomo Simoes's avatar Guilherme Giacomo Simoes Committed by Thomas Gleixner
Browse files

x86/vdso: Fix incorrect size in munmap() on map_vdso() failure 



In map_vdso(), if a failure occurs during the installation of the VVAR
mappings, the error path attempts to clean up previously allocated mappings
using do_munmap(). However, the cleanup for the VVAR mapping is incorrectly
using image->size (the size of the vDSO text) instead of the actual size
allocated for the VVAR area.

Replace the incorrect do_munmap() image->size parameter with the constant
VDSO_NR_PAGES * PAGE_SIZE. Ensure the unmap size exactly matches the size
used during the vdso_install_vvar_mapping() phase to provide a symmetrical
and complete teardown of the memory region.

Fixes: e93d2521 ("x86/vdso: Split virtual clock pages into dedicated mapping")
Signed-off-by: default avatarGuilherme Giacomo Simoes <trintaeoitogc@gmail.com>
Signed-off-by: default avatarThomas Gleixner <tglx@kernel.org>
Reviewed-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Link: https://patch.msgid.link/20260503191609.551817-1-trintaeoitogc@gmail.com
parent 5200f5f4

arch/x86/entry/vdso/vma.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr) 
	if (IS_ERR(vma)) {

		ret = PTR_ERR(vma);

		do_munmap(mm, text_start, image->size, NULL);

		do_munmap(mm, addr, image->size, NULL);

		do_munmap(mm, addr, VDSO_NR_PAGES * PAGE_SIZE, NULL);

		goto up_fail;

	}