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 243501D63F3; Mon, 23 Mar 2026 14:15:57 +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=1774275357; cv=none; b=iWRYrruI4zacAVRnVtqznDYXL9bG62dAEEc3UtFpnp+SO8ltdCIqlZgNzvMVA+pkEoNMXbxBm6HY6iGZu2dlSY7vwXvaNL90oP4CIPMMy87X4X+/qZNBY/fsc1J+UavaxIdfzPvwJdIOgCH4llV6lexrZLu56yK9pkICnGWUNq0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774275357; c=relaxed/simple; bh=8glqN8qGyjI/k+WtqDqQozaJ7Kpp4iD1HmZBs62p+m8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r6y5aAZ8H43t4h5y/GllzcwmPW4PnpmJEdj7xy14xw1FAruu/bCt69LkvFLCrlLF+UCUI/Yizmy7JZRL2Ii0VK5aagSrFkIMArjvF3+fM4/F/K4xedEg1BX6EhBufaFoPj+1cS8TIcayr2yhtKdDfINAKxWZsjjvFEpxg5+r1QI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NHY30QnH; 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="NHY30QnH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71D5AC4CEF7; Mon, 23 Mar 2026 14:15:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774275357; bh=8glqN8qGyjI/k+WtqDqQozaJ7Kpp4iD1HmZBs62p+m8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NHY30QnHWFdnJvvKKy3k/Aw5mRaP26G+zmnXeiVMyocWza59HKlLqrSTw5OVOkzef UFY754nD+aBnO1xrGrTx33h9aYfBlZa99WcemsCotApS64nJjbbUe5TI7gpUsqT4wn 4jDxqiTRm4/pqqRMj8SN9ATUEsoz+bCC6xLWsk20= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ian Rogers , Chen Ni , Adrian Hunter , Alexander Shishkin , Ingo Molnar , James Clark , Jiri Olsa , Mark Rutland , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 6.12 070/460] perf ftrace: Fix hashmap__new() error checking Date: Mon, 23 Mar 2026 14:41:06 +0100 Message-ID: <20260323134528.415955170@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134526.647552166@linuxfoundation.org> References: <20260323134526.647552166@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chen Ni [ Upstream commit be34705aa527872e5ce83927b7bc9307ba8095ca ] The hashmap__new() function never returns NULL, it returns error pointers. Fix the error checking to match. Additionally, set ftrace->profile_hash to NULL on error, and return the exact error code from hashmap__new(). Fixes: 0f223813edd051a5 ("perf ftrace: Add 'profile' command") Suggested-by: Ian Rogers Signed-off-by: Chen Ni Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Ingo Molnar Cc: James Clark Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/builtin-ftrace.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c index a56cf8b0a7d40..09c484182d5bc 100644 --- a/tools/perf/builtin-ftrace.c +++ b/tools/perf/builtin-ftrace.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include "debug.h" @@ -998,8 +999,12 @@ static int prepare_func_profile(struct perf_ftrace *ftrace) ftrace->graph_tail = 1; ftrace->profile_hash = hashmap__new(profile_hash, profile_equal, NULL); - if (ftrace->profile_hash == NULL) - return -ENOMEM; + if (IS_ERR(ftrace->profile_hash)) { + int err = PTR_ERR(ftrace->profile_hash); + + ftrace->profile_hash = NULL; + return err; + } return 0; } -- 2.51.0