From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 D43AE2110E; Tue, 27 May 2025 17:32:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748367172; cv=none; b=AVq6hgF+GTTKECyGABwS6gE/Zo2PlPaZNXRTW6XDah2hlI2IViiil/X/Ia2WkoxusV3RZpHPE4pDcsXNdidEP6lnEYlTrQ6/PXBP0KOOKpQoSSis3OPP/X6JfoapJ7ZIL61f+39FKGSRIXEYnZ2JxZB5LDK2HLwKOoQZlKeG72Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748367172; c=relaxed/simple; bh=94uZIlDEIn0s+G/xPYS1V61n3O/gkex0PryZWRQL2ZA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BfdzfNbn3lXw4+pD7ygFwyrvWUPVhDoiXiAnRrK19PrjHomvwl/rsuWRhiF/0PIajHvx+pZnYYmgSv+dFmxt9SsmEFwCqUZ8TIROiZjvpVZGghKodg1CCSKm404s+YJs0xPMZcJfEd480u0mPOXcB0K5sixIhRXbhvus+CUdei4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=utvKxBrQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="utvKxBrQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6438CC4CEE9; Tue, 27 May 2025 17:32:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748367172; bh=94uZIlDEIn0s+G/xPYS1V61n3O/gkex0PryZWRQL2ZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=utvKxBrQjIYxsGuzaRVox65BGuZ3JANSKdccKEWmM7k00XZ+D99VMLAwEVi/UZftv fkR3jVOKgxAtp1c3l/Mghv88TmzIEPYnk62yeLGKRjWPjuhqqMDV1PwgQEdOdoRvz9 j0pWYn23iGlTHLhm7j4OgdNz3CmzrmybAdU06Tpw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Peter Zijlstra (Intel)" , Ingo Molnar , Lorenzo Stoakes , Ravi Bangoria , Sasha Levin Subject: [PATCH 6.14 301/783] perf/core: Fix perf_mmap() failure path Date: Tue, 27 May 2025 18:21:38 +0200 Message-ID: <20250527162525.329395125@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162513.035720581@linuxfoundation.org> References: <20250527162513.035720581@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Peter Zijlstra [ Upstream commit 66477c7230eb1f9b90deb8c0f4da2bac2053c329 ] When f_ops->mmap() returns failure, m_ops->close() is *not* called. Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Acked-by: Lorenzo Stoakes Reviewed-by: Ravi Bangoria Link: https://lore.kernel.org/r/20241104135519.248358497@infradead.org Signed-off-by: Sasha Levin --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index de838d3819ca7..dda1670b3539a 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -6834,7 +6834,7 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma) if (!ret) ret = map_range(rb, vma); - if (event->pmu->event_mapped) + if (!ret && event->pmu->event_mapped) event->pmu->event_mapped(event, vma->vm_mm); return ret; -- 2.39.5