From mboxrd@z Thu Jan 1 00:00:00 1970 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 C59A2C76196 for ; Thu, 6 Apr 2023 06:52:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233235AbjDFGwy (ORCPT ); Thu, 6 Apr 2023 02:52:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235622AbjDFGww (ORCPT ); Thu, 6 Apr 2023 02:52:52 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F87D93F7 for ; Wed, 5 Apr 2023 23:52:48 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-536a4eba107so383492827b3.19 for ; Wed, 05 Apr 2023 23:52:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1680763967; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=hz2UPK4m45H+1eNN7MZgSequAvZQRYw5qeG2C4U++jk=; b=JxgoYm9UaTnNWuZkXDXX1g4D5/7zh5yHMr4HPxAMthnTd8D5SBZzzwPDE+HfqEk058 5wEGGsjfB4wrShPwguhXbZmGiFu4sFReXYGOI7bqs3H+wslYTM6G8/vlwibP589vhr2n xbyCz5xeyw/7ASmTNfLYcXjRTtWc7zuvrPrlBJ4xi4VnLLBFtKZqez8kVBsZi9hjFzTv Dpl6VmL6EgtW13Ki8uSWD3QHcnaTvisYMm7ZYID9MGlgDLHcadl774eOcyL7LViWtBiv V4dbwl4yK8QJavb0G7Tr2P/VEvuq2CBB1gw8j8vnGYqkVgR+AQoY+SU0BXTc++3M+mbp FHww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680763967; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hz2UPK4m45H+1eNN7MZgSequAvZQRYw5qeG2C4U++jk=; b=yB9/vILRbX68NA6179s6MdyEXt4F9gf3eA5DILqz7be7G6AkeTUq0dOeowX0bEklkC TdFy3OilyvMxsr1Ei0YJaR94IXaNt0LKJr105TpKBXMBXUY5jAYZJA7QSjIHQYIIvun+ /JiCeVeOYkC0K7vwnED+CEz9g29gg1H/ooyFj9WLhRz/fXSddU3mYu9ZkaqpyC2IfYA6 3wo9sKsGrts7MzNptfkn9vUSpUHOv62pCLVWYVLH1ZFHHOjLVsGXiZZgyJo748tW7C8l 65gWfZHCYJDDtaH1OZmXHXOFx8edLp0pv9evdOnYNr8GyS6mm6YiBvz0P3zrp0mmE6j6 Omtw== X-Gm-Message-State: AAQBX9e/FG0Qt59J7Cr2ANEpYVM1nSp0pxkShAARkOdOK0oeTCRzJI5d 3EOk2RXoetNn3aaqLSmsG+kY9gma1VP6 X-Google-Smtp-Source: AKy350ZN+bpSdH/jgcCOg5dClBkm0s9eVVLb9BjDZSxUljOR/Wj0s8JlpiFEeW1BY9w/pUlxwP7EunrjT9MI X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:713a:ed0b:3d14:a4da]) (user=irogers job=sendgmr) by 2002:a05:6902:909:b0:a27:3ecc:ffe7 with SMTP id bu9-20020a056902090900b00a273eccffe7mr1473850ybb.3.1680763967198; Wed, 05 Apr 2023 23:52:47 -0700 (PDT) Date: Wed, 5 Apr 2023 23:52:24 -0700 In-Reply-To: <20230406065224.2553640-1-irogers@google.com> Message-Id: <20230406065224.2553640-2-irogers@google.com> Mime-Version: 1.0 References: <20230406065224.2553640-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Subject: [PATCH v3 2/2] perf pmu: Fix a few potential fd leaks From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , James Clark , Suzuki Poulouse , Sean Christopherson , Ravi Bangoria , Rob Herring , Leo Yan , German Gomez , Jing Zhang , Gaosheng Cui , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Ensure fd is closed on error paths. Signed-off-by: Ian Rogers --- tools/perf/util/pmu.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 96ef317bac41..9eedbfc9e863 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -494,9 +494,13 @@ static int pmu_aliases_parse(int dirfd, struct list_head *head) continue; fd = openat(dirfd, name, O_RDONLY); + if (fd == -1) { + pr_debug("Cannot open %s\n", name); + continue; + } file = fdopen(fd, "r"); if (!file) { - pr_debug("Cannot open %s\n", name); + close(fd); continue; } @@ -1882,9 +1886,13 @@ int perf_pmu__caps_parse(struct perf_pmu *pmu) continue; fd = openat(caps_fd, name, O_RDONLY); + if (fd == -1) + continue; file = fdopen(fd, "r"); - if (!file) + if (!file) { + close(fd); continue; + } if (!fgets(value, sizeof(value), file) || (perf_pmu__new_caps(&pmu->caps, name, value) < 0)) { -- 2.40.0.348.gf938b09366-goog