Module Name: src
Committed By: msaitoh
Date: Tue Jun 3 13:53:28 UTC 2014
Modified Files:
src/sys/dev/pci: hifn7751.c
Log Message:
Avoid buffer overflow which was added in rev. 1.52.
This change fix a panic at boot time (PR#47950 Reported by Bert Kiers).
OK'd by tls.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/hifn7751.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/dev/pci/hifn7751.c
diff -u src/sys/dev/pci/hifn7751.c:1.54 src/sys/dev/pci/hifn7751.c:1.55
--- src/sys/dev/pci/hifn7751.c:1.54 Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/hifn7751.c Tue Jun 3 13:53:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hifn7751.c,v 1.54 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: hifn7751.c,v 1.55 2014/06/03 13:53:28 msaitoh Exp $ */
/* $FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */
/* $OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $ */
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.54 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.55 2014/06/03 13:53:28 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -700,6 +700,7 @@ hifn_rng_locked(void *vsc)
if (sc->sc_rng_need) {
nwords = (sc->sc_rng_need * NBBY) / HIFN_RNG_BITSPER;
+ nwords = MIN(__arraycount(num), nwords);
}
if (nwords < 2) {
