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 F3EA9C433F5 for ; Sat, 30 Apr 2022 14:49:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359868AbiD3Ow4 (ORCPT ); Sat, 30 Apr 2022 10:52:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1382869AbiD3Owz (ORCPT ); Sat, 30 Apr 2022 10:52:55 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 02BE628999 for ; Sat, 30 Apr 2022 07:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651330165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VOdz1ctG8DsfhQ/t3Bd0GmW9//GLUrDpBS4J4wmHKpE=; b=bbzTG6W3r5qQ5Z8OYrNcOHjjEiI434/yh4C3gJlAYiEGNqm4KQPjvSGsPmG8S2L7h74Mmk jVZD57+reUZY2uYXZK6ZoJlDdFmEXt9M6GjGz2alsCvIw//FNNFvhmymhlmEUsPJysz3bI JDX0M0NdjJQS/m2yjd832DpAUoF5ekQ= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-602-Z6fTtB8jNx2p5FUUIbKhCQ-1; Sat, 30 Apr 2022 10:49:23 -0400 X-MC-Unique: Z6fTtB8jNx2p5FUUIbKhCQ-1 Received: by mail-qv1-f69.google.com with SMTP id bu6-20020ad455e6000000b004563a74e3f9so7922413qvb.9 for ; Sat, 30 Apr 2022 07:49:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=VOdz1ctG8DsfhQ/t3Bd0GmW9//GLUrDpBS4J4wmHKpE=; b=G9Sxjrma9kSdLQdOVZh2B1IXin2GY9JityZgrBshWLG7DBxa6aUhXJeASU5Ym+2FvI PTPc2FQY2AbVouV0+0821II+tPGgpVJXiZCkNqZvTCJI9tal96fPpFyiVJIFXjo+uJBE 7/xAx8Gq889ha86Fz63aoV6abRt0sg3lrfRXXEiqLv8pqZoHjDeXfpHJqsbVP4M0n4h+ 2jTPeK5BWXnXb1QNL1Ql7Jo+dvwLcDx2+FRq35m4r51g+2vBKYbs15af+8zbwefKpKwn 8KMe7rKEOGAGDEAMTyNXlcaLy5BtoCku3kdstUcM9MfmETA77kjpoe331UcruLdqcTe3 D4eg== X-Gm-Message-State: AOAM531DGI4IO4iDdPJZU8nhYuQiTL99H/sXiLctTdaP50LF5inEPeLD ok9uFySdHJE98YPm0JHyCCF6UfoPPH0I61E4/cu6A7WyHCLCpkpoQvSMG38KQ8aWsBFfKGf9xUJ bI0yY+91fwwFwut3WjJo= X-Received: by 2002:a37:f50b:0:b0:680:dee3:e59d with SMTP id l11-20020a37f50b000000b00680dee3e59dmr2911331qkk.729.1651330163211; Sat, 30 Apr 2022 07:49:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzP2zV4X0CVFZZpyp9P4jtRx4/60L99V/JkcXscgJ7XrWASvOBkPEjf+mcNg4ZX/ZPygqtOyQ== X-Received: by 2002:a37:f50b:0:b0:680:dee3:e59d with SMTP id l11-20020a37f50b000000b00680dee3e59dmr2911320qkk.729.1651330163006; Sat, 30 Apr 2022 07:49:23 -0700 (PDT) Received: from localhost.localdomain (024-205-208-113.res.spectrum.com. [24.205.208.113]) by smtp.gmail.com with ESMTPSA id bb4-20020a05622a1b0400b002e218c3d4c6sm1133195qtb.2.2022.04.30.07.49.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 30 Apr 2022 07:49:22 -0700 (PDT) Subject: Re: [PATCH] tools/power turbostat: close file after use To: Chen Yu Cc: lenb@kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org References: <20220430141557.1065405-1-trix@redhat.com> <20220430141947.GA5101@chenyu5-mobl1> From: Tom Rix Message-ID: Date: Sat, 30 Apr 2022 07:49:19 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20220430141947.GA5101@chenyu5-mobl1> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org On 4/30/22 7:19 AM, Chen Yu wrote: > On Sat, Apr 30, 2022 at 10:15:57AM -0400, Tom Rix wrote: >> The cppcheck reports this issue >> turbostat.c:2039]: (error) Resource leak: fp >> >> When the fscanf fails an error is returned without closing fp. >> Move the fclose so even if the fscanf fails, the file will be closed. >> >> Fixes: eae97e053fe3 ("tools/power turbostat: Support thermal throttle count print") >> Signed-off-by: Tom Rix >> --- >> tools/power/x86/turbostat/turbostat.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c >> index ede31a4287a0..2e9a751af260 100644 >> --- a/tools/power/x86/turbostat/turbostat.c >> +++ b/tools/power/x86/turbostat/turbostat.c >> @@ -2035,9 +2035,9 @@ int get_core_throt_cnt(int cpu, unsigned long long *cnt) >> if (!fp) >> return -1; >> ret = fscanf(fp, "%lld", &tmp); >> + fclose(fp); >> if (ret != 1) >> return -1; >> - fclose(fp); >> *cnt = tmp; >> >> return 0; >> -- > Thank you Tom, and Colin has proposed a fix here: > https://lore.kernel.org/lkml/20220426131607.1520483-1-colin.i.king@gmail.com/ Obviously I approve of Colin's fix :) If it is not too much trouble, please add Reviewed-by: Tom Rix If it is already on its way to linux-next, don't worry about it. Thanks, Tom > > thanks, > Chenyu >