From nobody Fri Jun 26 19:18:30 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45C73C433F5 for ; Fri, 18 Feb 2022 15:23:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236975AbiBRPYK (ORCPT ); Fri, 18 Feb 2022 10:24:10 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:42710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236966AbiBRPYG (ORCPT ); Fri, 18 Feb 2022 10:24:06 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 340B22B2C63 for ; Fri, 18 Feb 2022 07:23:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645197828; x=1676733828; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Tys8vO5jpeQwCnqRIjfr24bGhzNHl5EH73fMc8XJTZA=; b=dr1soqJDNySDfeytT+SUSwi5p1nY7jmd8TmSc0L0WXZMGjpPrJsiRN0F 6m13Yg/lWkZHYrHsZyYWx+mCi6Ininikv6nWOBpDXowZQOqZ9LrXbVKR7 lGFrvm8BlNWFWzzU+TeqtAa/WN1SE0pRHzcweS+aSF/mELRte2AgPvv1f mNy5ct2bn8Q/Y/gwpxigJRK0lMHOV/IVXEzjcSaPeqCIQjYdC+bnLyHek AA9Tfvsh9WqiIe+fWHZAruWvxe1Bs3hXO+iOqNJh5xparMLcxUo7FNxYg E0U+MohkElsZFIY23rQGysyqjEfk+0oT98T7K9dKq0ZXBegxmOUI+Rh9F Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10261"; a="250900614" X-IronPort-AV: E=Sophos;i="5.88,379,1635231600"; d="scan'208";a="250900614" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2022 07:23:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,379,1635231600"; d="scan'208";a="546317536" Received: from nntpat99-84.inn.intel.com ([10.125.99.84]) by orsmga008.jf.intel.com with ESMTP; 18 Feb 2022 07:23:45 -0800 From: Alexey Bayduraev To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Ingo Molnar , linux-kernel , Andi Kleen , Adrian Hunter , Alexander Antonov , Alexei Budankov Subject: [PATCH urgent] perf data: Fix double free in perf_session__delete Date: Fri, 18 Feb 2022 18:23:41 +0300 Message-Id: <20220218152341.5197-2-alexey.v.bayduraev@linux.intel.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20220218152341.5197-1-alexey.v.bayduraev@linux.intel.com> References: <20220218152341.5197-1-alexey.v.bayduraev@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When perf_data__create_dir fails, it calls close_dir, but perf_session__delete also calls close_dir and since dir.version and dir.nr was initialized by perf_data__create_dir, a double free occurs. This patch moves the initialization of dir.version and dir.nr after successful initialization of dir.files, that prevents double freeing. This behavior is already implemented in perf_data__open_dir. Fixes: 145520631130bd64 ("perf data: Add perf_data__(create_dir|close_dir) = functions") Signed-off-by: Alexey Bayduraev Acked-by: Jiri Olsa --- tools/perf/util/data.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c index f5d260b1df4d..15a4547d608e 100644 --- a/tools/perf/util/data.c +++ b/tools/perf/util/data.c @@ -44,10 +44,6 @@ int perf_data__create_dir(struct perf_data *data, int nr) if (!files) return -ENOMEM; =20 - data->dir.version =3D PERF_DIR_VERSION; - data->dir.files =3D files; - data->dir.nr =3D nr; - for (i =3D 0; i < nr; i++) { struct perf_data_file *file =3D &files[i]; =20 @@ -62,6 +58,9 @@ int perf_data__create_dir(struct perf_data *data, int nr) file->fd =3D ret; } =20 + data->dir.version =3D PERF_DIR_VERSION; + data->dir.files =3D files; + data->dir.nr =3D nr; return 0; =20 out_err: --=20 2.19.0