Commit 41e583ed authored Oct 21, 2021 by Shuah Khan Committed by Greg Kroah-Hartman Nov 17, 2021

selftests: kvm: fix mismatched fclose() after popen()



[ 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>

parent 4411d0d8

tools/testing/selftests/kvm/x86_64/mmio_warning_test.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -84,7 +84,7 @@ int get_warnings_count(void)
	f = popen("dmesg \| grep \"WARNING:\" \| wc -l", "r");		f = popen("dmesg \| grep \"WARNING:\" \| wc -l", "r");
	if (fscanf(f, "%d", &warnings) < 1)		if (fscanf(f, "%d", &warnings) < 1)
	warnings = 0;		warnings = 0;
	fclose(f);		pclose(f);

	return warnings;		return warnings;
	}		}