From nobody Sat Jun 27 22:18:05 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 B5647C433F5 for ; Fri, 18 Feb 2022 11:30:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234512AbiBRLac (ORCPT ); Fri, 18 Feb 2022 06:30:32 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:49080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234507AbiBRLaa (ORCPT ); Fri, 18 Feb 2022 06:30:30 -0500 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9632A2AF93C for ; Fri, 18 Feb 2022 03:30:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645183814; x=1676719814; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=KGo8lcJ4F56kenYAwLaTbI82s91drMBP5GcCwMezJx8=; b=A/PiPf+EIvZffJNRgRcKqWOSvOERH03meykXbNTaq4IPLyRkgPkwjdOh 6LhODio+tx/Cy6BzIcjyI0V6hxx8sq2WBTFM27DxNrpmhyG14V+6If0D9 MGFuwY5ZWb3wCL2uKHmf9GPBeR+VXiBYZJSxQe7fK8lizXyAGX+akzaag dTSAlK4QpCr9BjeWuVSHk3fCparaGm5lRWeImFPnY4sZmdXKHuSJW/8dv 25hIiDQUxRNGTjauhrgCrC8CSYG6/6XeTfY1Z7JHT+0MzBdIYEHKNOFQk 2uqTzzjhFLZ887aRJkfW0kEVZC9aegw6woZbTO8WAXyi8G8bpMEyC7UEg g==; X-IronPort-AV: E=McAfee;i="6200,9189,10261"; a="337553335" X-IronPort-AV: E=Sophos;i="5.88,378,1635231600"; d="scan'208";a="337553335" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2022 03:30:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,378,1635231600"; d="scan'208";a="775265393" Received: from nntpat99-84.inn.intel.com ([10.125.99.84]) by fmsmga006.fm.intel.com with ESMTP; 18 Feb 2022 03:30:10 -0800 From: Alexey Bayduraev To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Ingo Molnar , linux-kernel , Adrian Hunter , Alexander Antonov , Alexei Budankov Subject: [PATCH] perf data: Fix double free in perf_session__delete Date: Fri, 18 Feb 2022 14:30:08 +0300 Message-Id: <20220218113008.24416-1-alexey.v.bayduraev@linux.intel.com> X-Mailer: git-send-email 2.19.0 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. The patch also adds a missing error message in case data directory creation fails. Signed-off-by: Alexey Bayduraev --- tools/perf/builtin-record.c | 4 +++- tools/perf/util/data.c | 7 +++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 0bc6529814b2..0306d5911de2 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1186,8 +1186,10 @@ static int record__mmap_evlist(struct record *rec, =20 if (record__threads_enabled(rec)) { ret =3D perf_data__create_dir(&rec->data, evlist->core.nr_mmaps); - if (ret) + if (ret) { + pr_err("Failed to create data directory: %s\n", strerror(errno)); return ret; + } for (i =3D 0; i < evlist->core.nr_mmaps; i++) { if (evlist->mmap) evlist->mmap[i].file =3D &rec->data.dir.files[i]; 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