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 B0F3178C67; Wed, 7 Aug 2024 15:10:07 +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=1723043407; cv=none; b=gloZdwtglzvuZEeDqWNGvtw1LsH20DwnI/Dl3fpWzTiZhgjhtqTHSqf+/1jH9qZqRcUykX7VitrVQL+g5M2WkYrW793HJcR2fnmqEU0Rgwce+2N3EYhZs21CUS4v/CeFa2Rh9wTqhmDX+QuV4hktfo9XQB6Jn57HruoKa2Q5VRk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723043407; c=relaxed/simple; bh=8tY4KUQEddpU/oxB4F6ywlvycT7nxFX2jwZRJpx7oD8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k2HcampH+SPCIRHfKfg6mGNROzVQmEi224wAHhHwL4kaGbogpBUORWaAVwxRvQLNrskmEpSpmbIKcqj7G2qtkip0XKAPrVcXkbDqBHJi1iD4SWOmV86LpWL7BXnYp8Tc4YELfnqrRR7d8w7zPEur+RA2g5OIEGN/rrYudNMorFM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=a5dMfomr; 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="a5dMfomr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42894C32781; Wed, 7 Aug 2024 15:10:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723043407; bh=8tY4KUQEddpU/oxB4F6ywlvycT7nxFX2jwZRJpx7oD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a5dMfomrFnGff5fG0qVefzuxdImJYxywmfY8dVDJg+37kEWPX6+XsmTNVjOUY3VYH 1JBU0deol2HdMB+sFp4Kj7dG5fZntyCeDZU6rwjxvswcID+EuB5RY0Fx3arV8k4G8c 4QB+56C32cBurLabyYAC8RntBpqQP5bjEsBcY6NM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Casey Chen , Ian Rogers , Arnaldo Carvalho de Melo , Namhyung Kim , yzhong@purestorage.com, Sasha Levin Subject: [PATCH 6.6 052/121] perf tool: fix dereferencing NULL al->maps Date: Wed, 7 Aug 2024 16:59:44 +0200 Message-ID: <20240807150021.110665555@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240807150019.412911622@linuxfoundation.org> References: <20240807150019.412911622@linuxfoundation.org> User-Agent: quilt/0.67 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Casey Chen [ Upstream commit 4c17736689ccfc44ec7dcc472577f25c34cf8724 ] With 0dd5041c9a0e ("perf addr_location: Add init/exit/copy functions"), when cpumode is 3 (macro PERF_RECORD_MISC_HYPERVISOR), thread__find_map() could return with al->maps being NULL. The path below could add a callchain_cursor_node with NULL ms.maps. add_callchain_ip() thread__find_symbol(.., &al) thread__find_map(.., &al) // al->maps becomes NULL ms.maps = maps__get(al.maps) callchain_cursor_append(..., &ms, ...) node->ms.maps = maps__get(ms->maps) Then the path below would dereference NULL maps and get segfault. fill_callchain_info() maps__machine(node->ms.maps); Fix it by checking if maps is NULL in fill_callchain_info(). Fixes: 0dd5041c9a0e ("perf addr_location: Add init/exit/copy functions") Signed-off-by: Casey Chen Reviewed-by: Ian Rogers Reviewed-by: Arnaldo Carvalho de Melo Acked-by: Namhyung Kim Cc: yzhong@purestorage.com Link: https://lore.kernel.org/r/20240722211548.61455-1-cachen@purestorage.com Signed-off-by: Namhyung Kim Signed-off-by: Sasha Levin --- tools/perf/util/callchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c index aee937d14fbbf..09e6b4e1401c9 100644 --- a/tools/perf/util/callchain.c +++ b/tools/perf/util/callchain.c @@ -1126,7 +1126,7 @@ int hist_entry__append_callchain(struct hist_entry *he, struct perf_sample *samp int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *node, bool hide_unresolved) { - struct machine *machine = maps__machine(node->ms.maps); + struct machine *machine = node->ms.maps ? maps__machine(node->ms.maps) : NULL; maps__put(al->maps); al->maps = maps__get(node->ms.maps); -- 2.43.0