From dc5b07a729fa86298afcafa5a2ff51ef51bcedd7 Mon Sep 17 00:00:00 2001 From: phk Date: Sat, 31 May 2003 16:57:01 +0000 Subject: Fix systematic off-by-one errors in unit number range checks. Found by: FlexeLint --- sys/i4b/driver/i4b_trace.c | 2 +- sys/i4b/layer1/ifpi/i4b_ifpi_pci.c | 4 ++-- sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c | 4 ++-- sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c | 4 ++-- sys/i4b/layer1/itjc/i4b_itjc_pci.c | 4 ++-- sys/i4b/layer2/i4b_l2fsm.c | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'sys/i4b') diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c index d7c89e0..7237fc1 100644 --- a/sys/i4b/driver/i4b_trace.c +++ b/sys/i4b/driver/i4b_trace.c @@ -156,7 +156,7 @@ get_trace_data_from_l1(i4b_trace_hdr_t *hdr, int len, char *buf) /* check valid unit no */ - if((unit = hdr->unit) > NI4BTRC) + if((unit = hdr->unit) >= NI4BTRC) { printf("i4b_trace: get_trace_data_from_l1 - unit > NI4BTRC!\n"); return(0); diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c index 8ff860e..6ab166c 100644 --- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c +++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c @@ -502,8 +502,8 @@ avma1pp_attach_avma1pp(device_t dev) bzero(sc, sizeof(struct l1_softc)); /* probably not really required */ - if(unit > IFPI_MAXUNIT) { - printf("avma1pp%d: Error, unit > IFPI_MAXUNIT!\n", unit); + if(unit >= IFPI_MAXUNIT) { + printf("avma1pp%d: Error, unit >= IFPI_MAXUNIT!\n", unit); splx(s); return(ENXIO); } diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c index e0f855f..a6850fc 100644 --- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c +++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c @@ -457,8 +457,8 @@ avma1pp2_attach_avma1pp(device_t dev) bzero(sc, sizeof(struct l1_softc)); /* probably not really required */ - if(unit > IFPI2_MAXUNIT) { - printf("ifpi2-%d: Error, unit > IFPI_MAXUNIT!\n", unit); + if(unit >= IFPI2_MAXUNIT) { + printf("ifpi2-%d: Error, unit >= IFPI_MAXUNIT!\n", unit); splx(s); return(ENXIO); } diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c index 01cfc69..79678a8 100644 --- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c +++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c @@ -470,8 +470,8 @@ avm_pnp_attach(device_t dev) bzero(sc, sizeof(struct l1_softc)); /* probably not really required */ - if(unit > IFPNP_MAXUNIT) { - printf("avm_pnp%d: Error, unit > IFPNP_MAXUNIT!\n", unit); + if(unit >= IFPNP_MAXUNIT) { + printf("avm_pnp%d: Error, unit >= IFPNP_MAXUNIT!\n", unit); splx(s); return(ENXIO); } diff --git a/sys/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/i4b/layer1/itjc/i4b_itjc_pci.c index e1028fe..c023f36 100644 --- a/sys/i4b/layer1/itjc/i4b_itjc_pci.c +++ b/sys/i4b/layer1/itjc/i4b_itjc_pci.c @@ -1523,9 +1523,9 @@ itjc_attach(device_t dev) bzero(sc, sizeof(struct l1_softc)); /* Probably not really required. */ - if (unit > ITJC_MAXUNIT) + if (unit >= ITJC_MAXUNIT) { - printf("itjc%d: Error, unit > ITJC_MAXUNIT!\n", unit); + printf("itjc%d: Error, unit >= ITJC_MAXUNIT!\n", unit); splx(s); return ENXIO; } diff --git a/sys/i4b/layer2/i4b_l2fsm.c b/sys/i4b/layer2/i4b_l2fsm.c index 311c9df..c4df653 100644 --- a/sys/i4b/layer2/i4b_l2fsm.c +++ b/sys/i4b/layer2/i4b_l2fsm.c @@ -226,8 +226,8 @@ void i4b_next_l2state(l2_softc_t *l2sc, int event) int (*savpostfsmfunc)(int) = NULL; /* check event number */ - if(event > N_EVENTS) - panic("i4b_l2fsm.c: event > N_EVENTS\n"); + if(event >= N_EVENTS) + panic("i4b_l2fsm.c: event >= N_EVENTS\n"); /* get current state and check it */ if((currstate = l2sc->Q921_state) > N_STATES) /* failsafe */ -- cgit v1.1