Module Name: src
Committed By: riz
Date: Wed Oct 31 17:30:21 UTC 2012
Modified Files:
src/sys/kern [netbsd-6]: subr_cprng.c
src/sys/netinet [netbsd-6]: tcp_subr.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #644):
sys/netinet/tcp_subr.c: revision 1.248
sys/kern/subr_cprng.c: revision 1.12
Fix a bug that kmem_alloc() is called from the interrupt context.
To generate a diff of this commit:
cvs rdiff -u -r1.5.2.4 -r1.5.2.5 src/sys/kern/subr_cprng.c
cvs rdiff -u -r1.246 -r1.246.2.1 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.5.2.4 src/sys/kern/subr_cprng.c:1.5.2.5
--- src/sys/kern/subr_cprng.c:1.5.2.4 Wed Oct 17 21:27:12 2012
+++ src/sys/kern/subr_cprng.c Wed Oct 31 17:30:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cprng.c,v 1.5.2.4 2012/10/17 21:27:12 riz Exp $ */
+/* $NetBSD: subr_cprng.c,v 1.5.2.5 2012/10/31 17:30:21 riz 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.5.2.4 2012/10/17 21:27:12 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.5.2.5 2012/10/31 17:30:21 riz 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.246 src/sys/netinet/tcp_subr.c:1.246.2.1
--- src/sys/netinet/tcp_subr.c:1.246 Sat Dec 31 20:41:59 2011
+++ src/sys/netinet/tcp_subr.c Wed Oct 31 17:30:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_subr.c,v 1.246 2011/12/31 20:41:59 christos Exp $ */
+/* $NetBSD: tcp_subr.c,v 1.246.2.1 2012/10/31 17:30:20 riz 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.246 2011/12/31 20:41:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.246.2.1 2012/10/31 17:30:20 riz Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -2219,7 +2219,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;
}
