Module Name: src
Committed By: riastradh
Date: Thu Aug 29 13:39:42 UTC 2024
Modified Files:
src/lib/libc/gen: Makefile.inc arc4random.c
Log Message:
arc4random(3): Pacify some of lint's complaints.
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/lib/libc/gen/Makefile.inc
cvs rdiff -u -r1.37 -r1.38 src/lib/libc/gen/arc4random.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/Makefile.inc
diff -u src/lib/libc/gen/Makefile.inc:1.218 src/lib/libc/gen/Makefile.inc:1.219
--- src/lib/libc/gen/Makefile.inc:1.218 Mon Jul 8 22:14:31 2024
+++ src/lib/libc/gen/Makefile.inc Thu Aug 29 13:39:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.218 2024/07/08 22:14:31 christos Exp $
+# $NetBSD: Makefile.inc,v 1.219 2024/08/29 13:39:42 riastradh Exp $
# from: @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
# gen sources
@@ -39,6 +39,8 @@ SRCS+= alarm.c alphasort.c arc4random.c
warnx.c warnc.c wordexp.c xsyslog.c \
vwarn.c vwarnx.c vwarnc.c verr.c verrx.c verrc.c
+LINTFLAGS.arc4random.c+=-Ac11 # stdatomic.h
+
# uses alloca
COPTS.execvp.c = -Wno-stack-protector
COPTS.execl.c = -Wno-stack-protector
Index: src/lib/libc/gen/arc4random.c
diff -u src/lib/libc/gen/arc4random.c:1.37 src/lib/libc/gen/arc4random.c:1.38
--- src/lib/libc/gen/arc4random.c:1.37 Tue Aug 27 13:43:02 2024
+++ src/lib/libc/gen/arc4random.c Thu Aug 29 13:39:42 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: arc4random.c,v 1.37 2024/08/27 13:43:02 riastradh Exp $ */
+/* $NetBSD: arc4random.c,v 1.38 2024/08/29 13:39:42 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: arc4random.c,v 1.37 2024/08/27 13:43:02 riastradh Exp $");
+__RCSID("$NetBSD: arc4random.c,v 1.38 2024/08/29 13:39:42 riastradh Exp $");
#include "namespace.h"
#include "reentrant.h"
@@ -422,7 +422,7 @@ entropy_epoch(void)
static atomic_int mib0[3];
static atomic_bool initialized = false;
int mib[3];
- unsigned epoch = -1;
+ unsigned epoch = (unsigned)-1;
size_t epochlen = sizeof(epoch);
/*
@@ -438,9 +438,9 @@ entropy_epoch(void)
size_t nmib = __arraycount(mib);
if (sysctlnametomib("kern.entropy.epoch", mib, &nmib) == -1)
- return -1;
+ return (unsigned)-1;
if (nmib != __arraycount(mib))
- return -1;
+ return (unsigned)-1;
atomic_store_explicit(&mib0[0], mib[0], memory_order_relaxed);
atomic_store_explicit(&mib0[1], mib[1], memory_order_relaxed);
atomic_store_explicit(&mib0[2], mib[2], memory_order_relaxed);
@@ -449,9 +449,9 @@ entropy_epoch(void)
}
if (sysctl(mib, __arraycount(mib), &epoch, &epochlen, NULL, 0) == -1)
- return -1;
+ return (unsigned)-1;
if (epochlen != sizeof(epoch))
- return -1;
+ return (unsigned)-1;
return epoch;
}
