Module Name: src
Committed By: christos
Date: Fri Apr 18 15:00:37 UTC 2014
Modified Files:
src/sys/arch/x86/x86: est.c
Log Message:
more conservative length check.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/x86/x86/est.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/arch/x86/x86/est.c
diff -u src/sys/arch/x86/x86/est.c:1.29 src/sys/arch/x86/x86/est.c:1.30
--- src/sys/arch/x86/x86/est.c:1.29 Thu Mar 27 14:22:56 2014
+++ src/sys/arch/x86/x86/est.c Fri Apr 18 11:00:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: est.c,v 1.29 2014/03/27 18:22:56 christos Exp $ */
+/* $NetBSD: est.c,v 1.30 2014/04/18 15:00:37 christos Exp $ */
/*
* Copyright (c) 2003 Michael Eriksson.
* All rights reserved.
@@ -76,7 +76,7 @@
* http://www.codemonkey.org.uk/projects/cpufreq/cpufreq-2.4.22-pre6-1.gz
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: est.c,v 1.29 2014/03/27 18:22:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: est.c,v 1.30 2014/04/18 15:00:37 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -1272,12 +1272,11 @@ est_tables(device_t self)
return false;
for (i = len = 0; i < sc->sc_fqlist->n; i++) {
-
+ if (len >= sc->sc_freqs_len)
+ break;
len += snprintf(sc->sc_freqs + len, sc->sc_freqs_len - len,
"%d%s", MSR2MHZ(sc->sc_fqlist->table[i], sc->sc_bus_clock),
i < sc->sc_fqlist->n - 1 ? " " : "");
- if (len > sc->sc_freqs_len)
- break;
}
aprint_debug_dev(self, "%d mV, %d (MHz): %s\n", mv,
