Skip to content

Commit b088fe3

Browse files
GuilhermeGiacomoSimoesThomas Gleixner
authored andcommitted
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: e93d252 ("x86/vdso: Split virtual clock pages into dedicated mapping") Signed-off-by: Guilherme Giacomo Simoes <trintaeoitogc@gmail.com> Signed-off-by: Thomas Gleixner <tglx@kernel.org> Reviewed-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de> Link: https://patch.msgid.link/20260503191609.551817-1-trintaeoitogc@gmail.com
1 parent 5200f5f commit b088fe3

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/x86/entry/vdso/vma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr)
178178
if (IS_ERR(vma)) {
179179
ret = PTR_ERR(vma);
180180
do_munmap(mm, text_start, image->size, NULL);
181-
do_munmap(mm, addr, image->size, NULL);
181+
do_munmap(mm, addr, VDSO_NR_PAGES * PAGE_SIZE, NULL);
182182
goto up_fail;
183183
}
184184

0 commit comments

Comments
 (0)