[src/trunk]: src/sys Fix off by one read error.

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eeed48ec5ad7
branches:  trunk
changeset: 783212:eeed48ec5ad7
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Dec 11 09:17:31 2012 +0000

description:
Fix off by one read error.

diffstat:

 sys/dev/usb/ubsa_common.c                         |  6 +++---
 sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c |  4 ++--
 sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c |  2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (60 lines):

diff -r 16c4fdbedb82 -r eeed48ec5ad7 sys/dev/usb/ubsa_common.c
--- a/sys/dev/usb/ubsa_common.c Tue Dec 11 07:31:39 2012 +0000
+++ b/sys/dev/usb/ubsa_common.c Tue Dec 11 09:17:31 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ubsa_common.c,v 1.8 2012/02/24 06:48:25 mrg Exp $      */
+/*     $NetBSD: ubsa_common.c,v 1.9 2012/12/11 09:17:31 msaitoh Exp $  */
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
  * All rights reserved.
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa_common.c,v 1.8 2012/02/24 06:48:25 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa_common.c,v 1.9 2012/12/11 09:17:31 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -105,7 +105,7 @@
        else
                req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
 
-       if (portno > UBSA_MAXCONN) {
+       if (portno >= UBSA_MAXCONN) {
                printf("%s: ubsa_request: invalid port(%d)#\n",
                        device_xname(sc->sc_dev), portno);
                return USBD_INVAL; 
diff -r 16c4fdbedb82 -r eeed48ec5ad7 sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c
--- a/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c Tue Dec 11 07:31:39 2012 +0000
+++ b/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c Tue Dec 11 09:17:31 2012 +0000
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: ah_eeprom_v14.c,v 1.5 2011/03/07 11:25:42 cegger Exp $
+ * $Id: ah_eeprom_v14.c,v 1.6 2012/12/11 09:22:16 msaitoh Exp $
  */
 #include "opt_ah.h"
 
@@ -255,7 +255,7 @@
        
        HALASSERT(AR5416_NUM_CTLS <= sizeof(ee->ee_rdEdgesPower)/NUM_EDGES);
 
-       for (i = 0; ee->ee_base.ctlIndex[i] != 0 && i < AR5416_NUM_CTLS; i++) {
+       for (i = 0; i < AR5416_NUM_CTLS && ee->ee_base.ctlIndex[i] != 0; i++) {
                for (j = 0; j < NUM_EDGES; j ++) {
                        /* XXX Confirm this is the right thing to do when an invalid channel is stored */
                        if (ee->ee_base.ctlData[i].ctlEdges[CTL_CHAIN][j].bChannel == AR5416_BCHAN_UNUSED) {
diff -r 16c4fdbedb82 -r eeed48ec5ad7 sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c
--- a/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c Tue Dec 11 07:31:39 2012 +0000
+++ b/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c Tue Dec 11 09:17:31 2012 +0000
@@ -238,7 +238,7 @@
        
        HALASSERT(AR5416_4K_NUM_CTLS <= sizeof(ee->ee_rdEdgesPower)/NUM_EDGES);
 
-       for (i = 0; ee->ee_base.ctlIndex[i] != 0 && i < AR5416_4K_NUM_CTLS; i++) {
+       for (i = 0; i < AR5416_4K_NUM_CTLS && ee->ee_base.ctlIndex[i] != 0; i++) {
                for (j = 0; j < NUM_EDGES; j ++) {
                        /* XXX Confirm this is the right thing to do when an invalid channel is stored */
                        if (ee->ee_base.ctlData[i].ctlEdges[CTL_CHAIN][j].bChannel == AR5416_BCHAN_UNUSED) {