Fixed an array bounds violation.

Let include guards comform to the Minix standard.

diff --git a/drivers/dpeth/3c509.c b/drivers/dpeth/3c509.c
index f9f9549b928db77316f91293d36f013c95231f1c..a51e2e2cc5ea9efdb8b2810cf7feb4bb7082c65d 100644 (file)
--- a/drivers/dpeth/3c509.c
+++ b/drivers/dpeth/3c509.c
@@ -385,7 +385,7 @@ static void el3_read_StationAddress(dpeth_t * dep)
 {
   unsigned int ix, rc;
 
-  for (ix = EE_3COM_NODE_ADDR; ix < SA_ADDR_LEN;) {
+  for (ix = EE_3COM_NODE_ADDR; ix < SA_ADDR_LEN+EE_3COM_NODE_ADDR;) {
        /* Accesses with word No. */
        rc = el3_read_eeprom(dep->de_id_port, ix / 2);
        /* Swaps bytes of word */

diff --git a/drivers/fxp/fxp.h b/drivers/fxp/fxp.h
index 208c2db099c37eeca2033fa217536b23e1a67a8b..ec1298b692a2ead902ec0356cea797bb037dd5fa 100644 (file)
--- a/drivers/fxp/fxp.h
+++ b/drivers/fxp/fxp.h
@@ -7,8 +7,8 @@ and 82562 fast ethernet controllers.
 Created:       Nov 2004 by Philip Homburg <philip@f-mnx.phicoh.com>
 */
 
-#ifndef _INC_FXP_H
-#define _INC_FXP_H
+#ifndef _FXP_FXP_H
+#define _FXP_FXP_H
 
 #define VERBOSE        0       /* display output during intialization */
 

diff --git a/drivers/fxp/mii.h b/drivers/fxp/mii.h
index 4f71f5e6e5bd0fbafb8396bd2d32a5b540c6c9c0..ebd3b5f19d94a3d7340e63de1d2507bba9bb6351 100644 (file)
--- a/drivers/fxp/mii.h
+++ b/drivers/fxp/mii.h
@@ -6,8 +6,8 @@ Created:        Nov 2004 by Philip Homburg <philip@f-mnx.phicoh.com>
 Definitions for the Media Independent (Ethernet) Interface
 */
 
-#ifndef _INC_MII_H
-#define _INC_MII_H
+#ifndef _FXP_MII_H
+#define _FXP_MII_H
 
 /* Registers in the Machine Independent Interface (MII) to the PHY.
  * IEEE 802.3 (2000 Edition) Clause 22.

diff --git a/include/sys/types.h b/include/sys/types.h
index 2795fc96b861e403dc49a86032fd1afb64f223a9..f56544c02d362bc839fc23f7b0a206097319b0f6 100644 (file)
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -1,5 +1,5 @@
-#ifndef _INC_SYS_TYPE_H
-#define _INC_SYS_TYPE_H
+#ifndef _INCLUDE_SYS_TYPE_H
+#define _INCLUDE_SYS_TYPE_H
 
 /*
  * this files resolves conflicts between the file of the host system and

diff --git a/servers/ds/inc.h b/servers/ds/inc.h
index b8f3630da3c27eb02f4686957ca0513a5fa51223..6f433e72752c6ba7052c447be3f2707b8b2a1fbc 100644 (file)
--- a/servers/ds/inc.h
+++ b/servers/ds/inc.h
@@ -1,5 +1,5 @@
-#ifndef _INC_INC_H
-#define _INC_INC_H
+#ifndef _DS_INC_H
+#define _DS_INC_H
 
 /* Header file including all needed system headers. */
 

diff --git a/servers/ds/proto.h b/servers/ds/proto.h
index 211ec6b4768f72e2a7c8c93adf7c753dfd10f51c..1bd5165956958ba1207fa04633ffa907655c8c6f 100644 (file)
--- a/servers/ds/proto.h
+++ b/servers/ds/proto.h
@@ -1,5 +1,5 @@
-#ifndef _INC_PROTO_H
-#define _INC_PROTO_H
+#ifndef _DS_PROTO_H
+#define _DS_PROTO_H
 
 /* Function prototypes. */
 

diff --git a/servers/ds/store.c b/servers/ds/store.c
index d80075171b018f1ba6f9a05d578279d089ab7dfe..fdd185ac9151c3fff863b0e28a1ee124c1872d4a 100644 (file)
--- a/servers/ds/store.c
+++ b/servers/ds/store.c
@@ -553,7 +553,7 @@ PUBLIC int do_subscribe(message *m_ptr)
 
   subp->flags = DSF_IN_USE | type_set;
   strcpy(subp->owner, owner);
-  for(b = 0; b < BITMAP_CHUNKS(NR_DS_SUBS); b++)
+  for(b = 0; b < BITMAP_CHUNKS(NR_DS_KEYS); b++)
        subp->old_subs[b] = 0;
 
   /* See if caller requested an instant initial list. */

diff --git a/servers/inet/generic/icmp.c b/servers/inet/generic/icmp.c
index 1cdfe70006f290053fbb301399fdf22e9f7038c8..855389a33d79e42ee5990e885ffb613d48b7c113 100644 (file)
--- a/servers/inet/generic/icmp.c
+++ b/servers/inet/generic/icmp.c
@@ -997,8 +997,6 @@ icmp_hdr_t *icmp_hdr;
 {
        int entries;
        int entry_size;
-       u32_t addr;
-       i32_t pref;
        u16_t lifetime;
        int i;
        char *bufp;
@@ -1053,6 +1051,9 @@ icmp_hdr_t *icmp_hdr;
        for (i= 0, bufp= (char *)&icmp_hdr->ih_dun.uhd_data[0]; i< entries; i++,
                bufp += entry_size)
        {
+               u32_t addr;
+               i32_t pref;
+
                addr= *(ipaddr_t *)bufp;
                pref= ntohl(*(u32_t *)(bufp+4));
                ipr_add_oroute(icmp_port->icp_ipport, HTONL(0L), HTONL(0L), 

diff --git a/servers/inet/generic/ip_ioctl.c b/servers/inet/generic/ip_ioctl.c
index 3099054b39bda8854ce6e39d99d6e6e86fb4aea4..055d6c72ce903ceb5cb79b7af343f6df065862b0 100644 (file)
--- a/servers/inet/generic/ip_ioctl.c
+++ b/servers/inet/generic/ip_ioctl.c
@@ -43,7 +43,7 @@ ioreq_t req;
        int ent_no, r;
        nwio_ipconf_t ipconf_var;
 
-       assert (fd>=0 && fd<=IP_FD_NR);
+       assert (fd>=0 && fd<IP_FD_NR);
        ip_fd= &ip_fd_table[fd];
 
        assert (ip_fd->if_flags & IFF_INUSE);