| Message ID | 20211021175335.22241-1-skhan@linuxfoundation.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c3867ab5924b7a9a0b4a117902a08669d8be7c21 |
| Headers | show |
| Series | selftests: kvm: fix mismatched fclose() after popen() | expand |
On 10/21/21 11:53 AM, Shuah Khan wrote: > get_warnings_count() foes fclose() using File * returned from popen(). Oops should have been "does". Sending v2 with that change now. > 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> > --- > 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 8039e1eff938..9f55ccd169a1 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; > } > thanks, -- Shuah
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 8039e1eff938..9f55ccd169a1 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; }
get_warnings_count() foes 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> --- tools/testing/selftests/kvm/x86_64/mmio_warning_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)