From nobody Mon May 25 01:58:59 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5303247ECE7; Tue, 19 May 2026 14:41:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779201684; cv=none; b=BkG4xEy+Ydyz6kn2OzgmGnEVBkg4e6kXkgPE9hRQ9V+MXEGWpTxRgpcGU7bA78qNv7Af3TIA4sqYKmnjSXtCX9+rJnjMlFc43esbp2zSagRlTM2/OJhW5muEnG0zvgHrbl+ZiT6dk3Kk5fcxDMlynpkopXscLLP2G8TaF/O/YxE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779201684; c=relaxed/simple; bh=HNR8v79IyNq5j93eXxDoLvXEWSasXrYslwXfjb5C1s0=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=BlwVv/iLsvMGCp9Mm9iAMbiDrwb2+dXEdbgYVquQrOl8VfJpwERvWMKx4G6Mm1Re9C7skopLx/TOlPkSS2MQqYMQE0xCiQoooqZmP40Jr8W9VmjstYpizvEcKuzTKcaXCq15nwjO4lzb07mnwfkOY8mHAR9VMJinSjqWOfcSfH4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=IvlsOu8b; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=h713RGUG; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="IvlsOu8b"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="h713RGUG" Date: Tue, 19 May 2026 14:41:19 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1779201681; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gVQ8M1UI64lYnA0Ss2TfJs7DB6Tg0DqjPtFSt2zS3lI=; b=IvlsOu8b5eGIzlZfUEKTkph3t4Kmr9dT5jRdbHWkEcDTfm4ZBTIKdAMJxVCGNFW4XOoVc0 68OZ6oX+GjyGCIT3vL/I0UxJDfL2WqOukeqFvZwIJTmodcOZ02vGnwKYQID4wiM+8ygGUf iH+OHKkbKcfCAXamhpERpLCWJ4vkGmSd6imil8VpRNsc2lDX62iioPVHX+i21haHizknSu CldnBDLlFSryX9W6SDpchCw0o9oQ0pPEQ3xSy4fMJCuiJLffWmQu2LkP3oPZ25lYOmx8aU 8VYAK/IXzE76Cuje0G4eanjv73TZKND2cVY5QWqimogLOWtdXoSNZDe59XKiHg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1779201681; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gVQ8M1UI64lYnA0Ss2TfJs7DB6Tg0DqjPtFSt2zS3lI=; b=h713RGUGHH3t0eLnBDgfj3MM918MeszkgHRu/X1Xfgjx/G+nP0cxPAGB0aUuA2BG1vxkfe amjhyfc5zRn5J6AQ== From: "tip-bot2 for Guilherme Giacomo Simoes" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/vdso: Fix incorrect size in munmap() on map_vdso() failure Cc: Guilherme Giacomo Simoes , Thomas Gleixner , thomas.weissschuh@linutronix.de, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260503191609.551817-1-trintaeoitogc@gmail.com> References: <20260503191609.551817-1-trintaeoitogc@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177920167991.711.4337013511598192038.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/urgent branch of tip: Commit-ID: b088fe35019433541225d315263d8477899e0657 Gitweb: https://git.kernel.org/tip/b088fe35019433541225d315263d84778= 99e0657 Author: Guilherme Giacomo Simoes AuthorDate: Sun, 03 May 2026 16:16:09 -03:00 Committer: Thomas Gleixner CommitterDate: Tue, 19 May 2026 16:36:34 +02:00 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: e93d2521b27f ("x86/vdso: Split virtual clock pages into dedicated ma= pping") Signed-off-by: Guilherme Giacomo Simoes Signed-off-by: Thomas Gleixner Reviewed-by: Thomas Wei=C3=9Fschuh Link: https://patch.msgid.link/20260503191609.551817-1-trintaeoitogc@gmail.= com --- arch/x86/entry/vdso/vma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c index a6bfcc8..d903bce 100644 --- a/arch/x86/entry/vdso/vma.c +++ b/arch/x86/entry/vdso/vma.c @@ -178,7 +178,7 @@ static int map_vdso(const struct vdso_image *image, uns= igned long addr) if (IS_ERR(vma)) { ret =3D 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; } =20