Module Name: src
Committed By: riastradh
Date: Mon Aug 11 13:59:24 UTC 2014
Modified Files:
src/sys/kern: kern_rndpool.c
Log Message:
buf is not guaranteed to be aligned; don't *(uint32_t *) it.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/kern/kern_rndpool.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_rndpool.c
diff -u src/sys/kern/kern_rndpool.c:1.6 src/sys/kern/kern_rndpool.c:1.7
--- src/sys/kern/kern_rndpool.c:1.6 Sun Aug 10 16:44:36 2014
+++ src/sys/kern/kern_rndpool.c Mon Aug 11 13:59:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndpool.c,v 1.6 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: kern_rndpool.c,v 1.7 2014/08/11 13:59:24 riastradh Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndpool.c,v 1.6 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndpool.c,v 1.7 2014/08/11 13:59:24 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -212,8 +212,7 @@ rndpool_add_data(rndpool_t *rp,
buf = p;
for (; len > 3; len -= 4) {
- val = *((const u_int32_t *)buf);
-
+ (void)memcpy(&val, buf, 4);
rndpool_add_one_word(rp, val);
buf += 4;
}
