zynq: fix out of bounds access in etherprobe()

calling etherprobe() with -1 cardno will rereference
and call cards[-1].reset() which is wrong. don't do that!

diff --git a/sys/src/9/zynq/devether.c b/sys/src/9/zynq/devether.c
index c6ed2eac37304338cb87efebd5b89bfdab37536f..90777e6f5241b7d1dfe8b81ecd01cd035cda2e3d 100644 (file)
--- a/sys/src/9/zynq/devether.c
+++ b/sys/src/9/zynq/devether.c
@@ -435,12 +435,6 @@ etherreset(void)
        Ether *ether;
        int cardno, ctlrno;
 
-       for(ctlrno = 0; ctlrno < MaxEther; ctlrno++){
-               if((ether = etherprobe(-1, ctlrno)) == nil)
-                       continue;
-               etherxx[ctlrno] = ether;
-       }
-
        cardno = ctlrno = 0;
        while(cards[cardno].type != nil && ctlrno < MaxEther){
                if(etherxx[ctlrno] != nil){

diff --git a/sys/src/9/zynq/etherif.h b/sys/src/9/zynq/etherif.h
index d7ea87523285c505b0ff7fb3d73da8c86e2f138f..80a39aa8b2658315986c80e213b19ceccde3cf9c 100644 (file)
--- a/sys/src/9/zynq/etherif.h
+++ b/sys/src/9/zynq/etherif.h
@@ -1,5 +1,5 @@
 enum {
-       MaxEther        = 64,
+       MaxEther        = 1,
        Ntypes          = 8,
 };