From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 D35D343E06E; Tue, 21 Jul 2026 22:43:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784673797; cv=none; b=FSBwXJXlpGxtACdQyGrDgcI2Nj4ZX27jUEbjYSt8hloSpW6xv8nUE0piXzZKADNKzOxC7HEZ0EcGyy4C8ufwYWPwSMpY3+uaS/d0q2gAnE8wMWnVSFX1KogLlrrv5VH5FO1yXxt/xdCBiPQC6tOx3LLY7EpZ4DT21WCCTxIn1U8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784673797; c=relaxed/simple; bh=f3xBXOll7bjSSiIvn9Cgivnx3u+nBGKnEEtT/IASpm8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Jz2mwvHYnR7B++grZwDNWNy5N5B+Yoly5+o3YVKNpF3rVQTa9O7TkbpIJR6WsGL+F6QAh3JeSQof7d5SB6imbfUR5lYpBUtxkrucyKQRRR/BlZIJ/PEPJ4l+LNaWJqAx9QGIHmnsxjGppRkQBhJHU+2IvvyRYfz1Larafvnajjs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lktBc600; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lktBc600" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4670C1F000E9; Tue, 21 Jul 2026 22:43:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784673795; bh=7zHQysmH/Pd0XrAiDLFZxI2cIx09FtLacQj+5fCaIXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lktBc600t7x/QMtbXxvP99lvNMrLl3E04dTIOJbpdUUdJxnQ/k3MqbksalhVkigL3 O9exUJcKLjBuSQXrotZF7KEypg89MOc6/Chjur3vcvexd0o7IZmenIN25PNnH42e8E /ugT6fgEF5c1EHKOt0zf24sRub2N48EtDzS3Hvlo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sashiko-bot , Alexey Budankov , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.10 297/699] perf mmap: Fix NULL deref in aio cleanup on alloc failure Date: Tue, 21 Jul 2026 17:20:56 +0200 Message-ID: <20260721152402.397824817@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152355.667394603@linuxfoundation.org> References: <20260721152355.667394603@linuxfoundation.org> User-Agent: quilt/0.69 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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnaldo Carvalho de Melo [ Upstream commit 25627346b10e6a564610ea2c49dc6dd54812226d ] perf_mmap__aio_mmap() sets map->aio.nr_cblocks before allocating the data array. If calloc() for aiocb or cblocks fails before the data array is allocated, the return -1 path leads to perf_mmap__aio_munmap() which loops nr_cblocks times calling perf_mmap__aio_free(). Both versions of perf_mmap__aio_free() (NUMA and non-NUMA) dereference map->aio.data[idx] without checking if data is NULL, causing a NULL pointer dereference. Add NULL checks for map->aio.data at the top of both perf_mmap__aio_free() variants so the cleanup path is safe when allocation fails partway through perf_mmap__aio_mmap(). Fixes: d3d1af6f011a553a ("perf record: Enable asynchronous trace writing") Reported-by: sashiko-bot Cc: Alexey Budankov Assisted-by: Claude:claude-opus-4.6 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/mmap.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c index ab7108d22428b5..35ca944970a957 100644 --- a/tools/perf/util/mmap.c +++ b/tools/perf/util/mmap.c @@ -88,10 +88,10 @@ static int perf_mmap__aio_alloc(struct mmap *map, int idx) static void perf_mmap__aio_free(struct mmap *map, int idx) { - if (map->aio.data[idx]) { - munmap(map->aio.data[idx], mmap__mmap_len(map)); - map->aio.data[idx] = NULL; - } + if (!map->aio.data || !map->aio.data[idx]) + return; + munmap(map->aio.data[idx], mmap__mmap_len(map)); + map->aio.data[idx] = NULL; } static int perf_mmap__aio_bind(struct mmap *map, int idx, int cpu, int affinity) @@ -134,6 +134,8 @@ static int perf_mmap__aio_alloc(struct mmap *map, int idx) static void perf_mmap__aio_free(struct mmap *map, int idx) { + if (!map->aio.data) + return; zfree(&(map->aio.data[idx])); } -- 2.53.0