CVS commit: src/tests/lib/libc/sys

[Rin Okuyama]

Module Name:    src
Committed By:   rin
Date:           Thu Aug  3 03:18:12 UTC 2023

Modified Files:
        src/tests/lib/libc/sys: t_getrandom.c

Log Message:
t_getrandom: Fix false positives for short read(2)

This only affects really slooooow machines, 68030 for me :)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/sys/t_getrandom.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/tests/lib/libc/sys/t_getrandom.c
diff -u src/tests/lib/libc/sys/t_getrandom.c:1.4 src/tests/lib/libc/sys/t_getrandom.c:1.5
--- src/tests/lib/libc/sys/t_getrandom.c:1.4	Fri Mar 18 23:35:37 2022
+++ src/tests/lib/libc/sys/t_getrandom.c	Thu Aug  3 03:18:12 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_getrandom.c,v 1.4 2022/03/18 23:35:37 riastradh Exp $	*/
+/*	$NetBSD: t_getrandom.c,v 1.5 2023/08/03 03:18:12 rin Exp $	*/
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_getrandom.c,v 1.4 2022/03/18 23:35:37 riastradh Exp $");
+__RCSID("$NetBSD: t_getrandom.c,v 1.5 2023/08/03 03:18:12 rin Exp $");
 
 #include <sys/param.h>
 
@@ -94,7 +94,7 @@ ATF_TC_BODY(getrandom_default, tc)
 		ATF_CHECK(n >= (ssize_t)MIN(256, sizeof buf));
 		ATF_CHECK((size_t)n <= sizeof buf);
 		ATF_CHECK(memcmp(buf, zero24, 24) != 0);
-		ATF_CHECK(memcmp(buf + sizeof buf - 24, zero24, 24) != 0);
+		ATF_CHECK(memcmp(buf + n - 24, zero24, 24) != 0);
 	}
 	alarm(0);
 }
@@ -117,7 +117,7 @@ ATF_TC_BODY(getrandom_nonblock, tc)
 		ATF_CHECK(n >= (ssize_t)MIN(256, sizeof buf));
 		ATF_CHECK((size_t)n <= sizeof buf);
 		ATF_CHECK(memcmp(buf, zero24, 24) != 0);
-		ATF_CHECK(memcmp(buf + sizeof buf - 24, zero24, 24) != 0);
+		ATF_CHECK(memcmp(buf + n - 24, zero24, 24) != 0);
 	}
 }
 
@@ -137,7 +137,7 @@ ATF_TC_BODY(getrandom_insecure, tc)
 	ATF_CHECK(n >= (ssize_t)MIN(256, sizeof buf));
 	ATF_CHECK((size_t)n <= sizeof buf);
 	ATF_CHECK(memcmp(buf, zero24, 24) != 0);
-	ATF_CHECK(memcmp(buf + sizeof buf - 24, zero24, 24) != 0);
+	ATF_CHECK(memcmp(buf + n - 24, zero24, 24) != 0);
 }
 
 ATF_TC(getrandom_insecure_nonblock);
@@ -157,7 +157,7 @@ ATF_TC_BODY(getrandom_insecure_nonblock,
 	ATF_CHECK(n >= (ssize_t)MIN(256, sizeof buf));
 	ATF_CHECK((size_t)n <= sizeof buf);
 	ATF_CHECK(memcmp(buf, zero24, 24) != 0);
-	ATF_CHECK(memcmp(buf + sizeof buf - 24, zero24, 24) != 0);
+	ATF_CHECK(memcmp(buf + n - 24, zero24, 24) != 0);
 }
 
 ATF_TC(getrandom_random);