Module Name:    src
Committed By:   riastradh
Date:           Mon Aug 26 13:48:04 UTC 2024

Modified Files:
        src/sys/kern: kern_entropy.c

Log Message:
kern.entropy.gather: Fail with EINTR on signal.

Just don't throw away the error code we already have!

PR kern/58646: /dev/random, kern.entropy.*: signal bugs


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/kern/kern_entropy.c

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

Modified files:

Index: src/sys/kern/kern_entropy.c
diff -u src/sys/kern/kern_entropy.c:1.68 src/sys/kern/kern_entropy.c:1.69
--- src/sys/kern/kern_entropy.c:1.68	Mon Aug 26 13:47:52 2024
+++ src/sys/kern/kern_entropy.c	Mon Aug 26 13:48:04 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_entropy.c,v 1.68 2024/08/26 13:47:52 riastradh Exp $	*/
+/*	$NetBSD: kern_entropy.c,v 1.69 2024/08/26 13:48:04 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_entropy.c,v 1.68 2024/08/26 13:47:52 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_entropy.c,v 1.69 2024/08/26 13:48:04 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -1450,7 +1450,7 @@ sysctl_entropy_gather(SYSCTLFN_ARGS)
 		mutex_exit(&E->lock);
 	}
 
-	return 0;
+	return error;
 }
 
 /*

Reply via email to