power: fix resource leak
authorLiang Ma <liang.j.ma@intel.com>
Mon, 8 Apr 2019 16:19:16 +0000 (17:19 +0100)
committerThomas Monjalon <thomas@monjalon.net>
Thu, 9 May 2019 19:07:55 +0000 (21:07 +0200)
Fix the resource leaking issue

Coverity issue: 337668
Fixes: b60fd5f8b1ce8f0a2c ("power: add bit for high frequency cores")

Signed-off-by: Liang Ma <liang.j.ma@intel.com>
Tested-by: David Hunt <david.hunt@intel.com>
lib/librte_power/power_pstate_cpufreq.c

index c2c4e8e..44a0b4a 100644 (file)
@@ -158,6 +158,7 @@ power_init_for_setting_freq(struct pstate_power_info *pi)
        char *s_base;
        uint32_t base_ratio = 0;
        uint64_t max_non_turbo = 0;
+       int  ret_val = 0;
 
        snprintf(fullpath_min, sizeof(fullpath_min), POWER_SYSFILE_MIN_FREQ,
                        pi->lcore_id);
@@ -199,8 +200,10 @@ power_init_for_setting_freq(struct pstate_power_info *pi)
 
        /* Add MSR read to detect turbo status */
 
-       if (power_rdmsr(PLATFORM_INFO, &max_non_turbo, pi->lcore_id) < 0)
-               return -1;
+       if (power_rdmsr(PLATFORM_INFO, &max_non_turbo, pi->lcore_id) < 0) {
+               ret_val = -1;
+               goto out;
+       }
 
        max_non_turbo = (max_non_turbo&NON_TURBO_MASK)>>NON_TURBO_OFFSET;
 
@@ -219,7 +222,9 @@ power_init_for_setting_freq(struct pstate_power_info *pi)
        pi->core_base_freq = base_ratio * BUS_FREQ;
 
 out:
-       return 0;
+       if (f_base != NULL)
+               fclose(f_base);
+       return ret_val;
 }
 
 static int