[GIT PULL] Kselftest next update for Linux 5.16-rc1

[Shuah Khan <skhan@linuxfoundation.org>]

[-- Attachment #1: Type: text/plain, Size: 1529 bytes --]

Hi Linus,

Please pull the following Kselftest next update for Linux 5.16-rc1.

This Kselftest update for Linux 5.16-rc1 consists of fixes to compile
time errors and warnings.

diff is attached.

thanks,
-- Shuah

----------------------------------------------------------------
The following changes since commit 519d81956ee277b4419c723adfb154603c2565ba:

   Linux 5.15-rc6 (2021-10-17 20:00:13 -1000)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-next-5.16-rc1

for you to fetch changes up to f35dcaa0a8a29188ed61083d153df1454cf89d08:

   selftests/core: fix conflicting types compile error for close_range() (2021-10-29 13:09:42 -0600)

----------------------------------------------------------------
linux-kselftest-next-5.16-rc1

This Kselftest update for Linux 5.16-rc1 consists of fixes to compile
time error and warnings.

----------------------------------------------------------------
Shuah Khan (3):
       selftests: kvm: fix mismatched fclose() after popen()
       selftests: x86: fix [-Wstringop-overread] warn in test_process_vm_readv()
       selftests/core: fix conflicting types compile error for close_range()

  tools/testing/selftests/core/close_range_test.c        | 2 +-
  tools/testing/selftests/kvm/x86_64/mmio_warning_test.c | 2 +-
  tools/testing/selftests/x86/test_vsyscall.c            | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------

[-- Attachment #2: linux-kselftest-next-5.16-rc1.diff --]
[-- Type: text/x-patch, Size: 1564 bytes --]

diff --git a/tools/testing/selftests/core/close_range_test.c b/tools/testing/selftests/core/close_range_test.c
index 73eb29c916d1..aa7d13d91963 100644
--- a/tools/testing/selftests/core/close_range_test.c
+++ b/tools/testing/selftests/core/close_range_test.c
@@ -54,7 +54,7 @@ static inline int sys_close_range(unsigned int fd, unsigned int max_fd,
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #endif
 
-TEST(close_range)
+TEST(core_close_range)
 {
 	int i, ret;
 	int open_fds[101];
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;
 }
diff --git a/tools/testing/selftests/x86/test_vsyscall.c b/tools/testing/selftests/x86/test_vsyscall.c
index 65c141ebfbbd..5b45e6986aea 100644
--- a/tools/testing/selftests/x86/test_vsyscall.c
+++ b/tools/testing/selftests/x86/test_vsyscall.c
@@ -497,7 +497,7 @@ static int test_process_vm_readv(void)
 	}
 
 	if (vsyscall_map_r) {
-		if (!memcmp(buf, (const void *)0xffffffffff600000, 4096)) {
+		if (!memcmp(buf, remote.iov_base, sizeof(buf))) {
 			printf("[OK]\tIt worked and read correct data\n");
 		} else {
 			printf("[FAIL]\tIt worked but returned incorrect data\n");