Module Name: src
Committed By: msaitoh
Date: Sat Sep 8 02:58:13 UTC 2012
Modified Files:
src/sys/kern: subr_cprng.c
src/sys/netinet: tcp_subr.c
Log Message:
Fix a bug that kmem_alloc() is called from the interrupt context.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/kern/subr_cprng.c
cvs rdiff -u -r1.247 -r1.248 src/sys/netinet/tcp_subr.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/subr_cprng.c
diff -u src/sys/kern/subr_cprng.c:1.11 src/sys/kern/subr_cprng.c:1.12
--- src/sys/kern/subr_cprng.c:1.11 Fri Sep 7 02:42:13 2012
+++ src/sys/kern/subr_cprng.c Sat Sep 8 02:58:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cprng.c,v 1.11 2012/09/07 02:42:13 tls Exp $ */
+/* $NetBSD: subr_cprng.c,v 1.12 2012/09/08 02:58:13 msaitoh Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
#include <sys/cprng.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.11 2012/09/07 02:42:13 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.12 2012/09/08 02:58:13 msaitoh Exp $");
void
cprng_init(void)
@@ -284,7 +284,8 @@ rekeyany:
* If the generator has just been keyed, perform
* the statistical RNG test.
*/
- if (__predict_false(c->drbg.reseed_counter == 1)) {
+ if (__predict_false(c->drbg.reseed_counter == 1) &&
+ (flags & FASYNC) == 0) {
rngtest_t *rt = kmem_alloc(sizeof(*rt), KM_NOSLEEP);
if (rt) {
Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.247 src/sys/netinet/tcp_subr.c:1.248
--- src/sys/netinet/tcp_subr.c:1.247 Thu Mar 22 20:34:39 2012
+++ src/sys/netinet/tcp_subr.c Sat Sep 8 02:58:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_subr.c,v 1.247 2012/03/22 20:34:39 drochner Exp $ */
+/* $NetBSD: tcp_subr.c,v 1.248 2012/09/08 02:58:13 msaitoh Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.247 2012/03/22 20:34:39 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.248 2012/09/08 02:58:13 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -2214,7 +2214,7 @@ tcp_new_iss1(void *laddr, void *faddr, u
*/
if (tcp_iss_gotten_secret == false) {
cprng_strong(kern_cprng,
- tcp_iss_secret, sizeof(tcp_iss_secret), 0);
+ tcp_iss_secret, sizeof(tcp_iss_secret), FASYNC);
tcp_iss_gotten_secret = true;
}
