Module Name: src
Committed By: msaitoh
Date: Mon Nov 3 15:27:46 UTC 2014
Modified Files:
src/sys/kern [netbsd-6]: kern_rndpool.c kern_rndq.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1118):
sys/kern/kern_rndq.c: revision 1.27
sys/kern/kern_rndpool.c: revision 1.7
buf is not guaranteed to be aligned; don't *(uint32_t *) it in kern_rndq.c.
done is not guaranteed to be aligned; don't *(uint32_t *) it in kern_rndq.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/kern/kern_rndpool.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/kern/kern_rndq.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.1.2.1 src/sys/kern/kern_rndpool.c:1.1.2.2
--- src/sys/kern/kern_rndpool.c:1.1.2.1 Fri Apr 20 23:35:20 2012
+++ src/sys/kern/kern_rndpool.c Mon Nov 3 15:27:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndpool.c,v 1.1.2.1 2012/04/20 23:35:20 riz Exp $ */
+/* $NetBSD: kern_rndpool.c,v 1.1.2.2 2014/11/03 15:27:46 msaitoh 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.1.2.1 2012/04/20 23:35:20 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndpool.c,v 1.1.2.2 2014/11/03 15:27:46 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -191,8 +191,7 @@ rndpool_add_data(rndpool_t *rp, void *p,
buf = p;
for (; len > 3; len -= 4) {
- val = *((u_int32_t *)buf);
-
+ (void)memcpy(&val, buf, 4);
rndpool_add_one_word(rp, val);
buf += 4;
}
Index: src/sys/kern/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.1.2.5 src/sys/kern/kern_rndq.c:1.1.2.6
--- src/sys/kern/kern_rndq.c:1.1.2.5 Fri Feb 8 20:28:07 2013
+++ src/sys/kern/kern_rndq.c Mon Nov 3 15:27:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.1.2.5 2013/02/08 20:28:07 riz Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.1.2.6 2014/11/03 15:27:46 msaitoh Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.1.2.5 2013/02/08 20:28:07 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.1.2.6 2014/11/03 15:27:46 msaitoh Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -663,7 +663,8 @@ rnd_add_data_ts(krndsource_t *rs, const
u_int32_t entropy, uint32_t ts)
{
rnd_sample_t *state = NULL;
- const uint32_t *dint = data;
+ const uint8_t *p = data;
+ uint32_t dint;
int todo, done, filled = 0;
SIMPLEQ_HEAD(, _rnd_sample_t) tmp_samples =
SIMPLEQ_HEAD_INITIALIZER(tmp_samples);
@@ -676,7 +677,7 @@ rnd_add_data_ts(krndsource_t *rs, const
* Loop over data packaging it into sample buffers.
* If a sample buffer allocation fails, drop all data.
*/
- todo = len / sizeof(*dint);
+ todo = len / sizeof(dint);
for (done = 0; done < todo ; done++) {
state = rs->state;
if (state == NULL) {
@@ -688,7 +689,8 @@ rnd_add_data_ts(krndsource_t *rs, const
}
state->ts[state->cursor] = ts;
- state->values[state->cursor] = dint[done];
+ (void)memcpy(&dint, &p[done*4], 4);
+ state->values[state->cursor] = dint;
state->cursor++;
if (state->cursor == RND_SAMPLE_COUNT) {
