| From 391e3e0d3f1f9b6f87601a76bc09d8f739e87799 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 21 Oct 2021 11:56:03 -0600 |
| Subject: selftests: kvm: fix mismatched fclose() after popen() |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Shuah Khan <skhan@linuxfoundation.org> |
| |
| [ Upstream commit c3867ab5924b7a9a0b4a117902a08669d8be7c21 ] |
| |
| get_warnings_count() does fclose() using File * returned from popen(). |
| Fix it to call pclose() as it should. |
| |
| tools/testing/selftests/kvm/x86_64/mmio_warning_test |
| x86_64/mmio_warning_test.c: In function ‘get_warnings_count’: |
| x86_64/mmio_warning_test.c:87:9: warning: ‘fclose’ called on pointer returned from a mismatched allocation function [-Wmismatched-dealloc] |
| 87 | fclose(f); |
| | ^~~~~~~~~ |
| x86_64/mmio_warning_test.c:84:13: note: returned from ‘popen’ |
| 84 | f = popen("dmesg | grep \"WARNING:\" | wc -l", "r"); |
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| |
| Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> |
| Acked-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/testing/selftests/kvm/x86_64/mmio_warning_test.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/tools/testing/selftests/kvm/x86_64/mmio_warning_test.c b/tools/testing/selftests/kvm/x86_64/mmio_warning_test.c |
| index 2cbc09aad7f64..92419b66b0578 100644 |
| --- a/tools/testing/selftests/kvm/x86_64/mmio_warning_test.c |
| +++ b/tools/testing/selftests/kvm/x86_64/mmio_warning_test.c |
| @@ -84,7 +84,7 @@ int get_warnings_count(void) |
| f = popen("dmesg | grep \"WARNING:\" | wc -l", "r"); |
| if (fscanf(f, "%d", &warnings) < 1) |
| warnings = 0; |
| - fclose(f); |
| + pclose(f); |
| |
| return warnings; |
| } |
| -- |
| 2.33.0 |
| |