[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/10] target/i386: Clean up error cases for vmsr_read_thread_stat
From: |
Paolo Bonzini |
Subject: |
[PULL 08/10] target/i386: Clean up error cases for vmsr_read_thread_stat() |
Date: |
Wed, 31 Jul 2024 13:18:04 +0200 |
From: Anthony Harivel <aharivel@redhat.com>
Fix leaking memory of file handle in case of error
Erase unused "pid = -1"
Add clearer error_report
Should fix Coverity CID 1558557.
Signed-off-by: Anthony Harivel <aharivel@redhat.com>
Link: 20240726102632.1324432-3-aharivel@redhat.com">https://lore.kernel.org/r/20240726102632.1324432-3-aharivel@redhat.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/kvm/vmsr_energy.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/target/i386/kvm/vmsr_energy.c b/target/i386/kvm/vmsr_energy.c
index a1d78f2f2ae..7e064c5aef3 100644
--- a/target/i386/kvm/vmsr_energy.c
+++ b/target/i386/kvm/vmsr_energy.c
@@ -270,7 +270,7 @@ void vmsr_read_thread_stat(pid_t pid,
FILE *file = fopen(path, "r");
if (file == NULL) {
- pid = -1;
+ error_report("Error opening %s", path_name);
return;
}
@@ -279,7 +279,8 @@ void vmsr_read_thread_stat(pid_t pid,
" %*u %*u %*u %*u %*u %*u %*u %*u %*u %*d %*u %*u %u",
utime, stime, cpu_id) != 3)
{
- pid = -1;
+ fclose(file);
+ error_report("Error fscanf did not report the right amount of items");
return;
}
--
2.45.2
- [PULL 00/10] i386, tests/vm changes for QEMU 9.1-rc, Paolo Bonzini, 2024/07/31
- [PULL 01/10] tests/vm/openbsd: Install tomli, Paolo Bonzini, 2024/07/31
- [PULL 02/10] target/i386: Change unavail from u32 to u64, Paolo Bonzini, 2024/07/31
- [PULL 03/10] target/i386/cpu: Remove unnecessary SGX feature words checks, Paolo Bonzini, 2024/07/31
- [PULL 04/10] target/i386/cpu: Explicitly express SGX_LC and SGX feature words dependency, Paolo Bonzini, 2024/07/31
- [PULL 05/10] target/i386/cpu: Add dependencies of CPUID 0x12 leaves, Paolo Bonzini, 2024/07/31
- [PULL 07/10] target/i386: Fix typo that assign same value twice, Paolo Bonzini, 2024/07/31
- [PULL 08/10] target/i386: Clean up error cases for vmsr_read_thread_stat(),
Paolo Bonzini <=
- [PULL 06/10] target/i386/cpu: Mask off SGX/SGX_LC feature words for non-PC machine, Paolo Bonzini, 2024/07/31
- [PULL 09/10] qemu-vmsr-helper: fix socket loop breakage, Paolo Bonzini, 2024/07/31
- [PULL 10/10] qemu-vmsr-helper: implement --verbose/-v, Paolo Bonzini, 2024/07/31
- Re: [PULL 00/10] i386, tests/vm changes for QEMU 9.1-rc, Richard Henderson, 2024/07/31