Skip to contentSkip to conversation

net: mcf: limit buffer descriptor count

PATCH Applied P J P 3 participants 3 messages Sep 22, 2016 – Sep 23, 2016

v2 of 3 Applied Latest is v3 →

lore
Share & tools
lore

P J P

author
#0 lore raw

PATCH v2 1/1 net: mcf: limit buffer descriptor count

From: Prasad J Pandit <[email protected]>

ColdFire Fast Ethernet Controller uses buffer descriptors to manage data flow to/fro receive & transmit queues. While transmitting packets, it could continue to read buffer descriptors if a buffer descriptor has length of zero and has crafted values in bd.flags. Set upper limit to number of buffer descriptors.

---
 hw/net/mcf_fec.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Update per
-> https://lists.gnu.org/archive/html/qemu-devel/2016-09/msg05284.html

hw/net/mcf_fec.c +3 -2
index 7c0398e..6d3418e 100644
@@ -23,6 +23,7 @@ do { printf("mcf_fec: " fmt , ## __VA_ARGS__); } while (0)
 #define DPRINTF(fmt, ...) do {} while(0)
 #endif
 
+#define FEC_MAX_DESC 1024
 #define FEC_MAX_FRAME_SIZE 2032
 
 typedef struct {
@@ -149,7 +150,7 @@ static void mcf_fec_do_tx(mcf_fec_state *s)
     uint32_t addr;
     mcf_fec_bd bd;
     int frame_size;
-    int len;
+    int len, descnt = 0;
     uint8_t frame[FEC_MAX_FRAME_SIZE];
     uint8_t *ptr;
 
@@ -157,7 +158,7 @@ static void mcf_fec_do_tx(mcf_fec_state *s)
     ptr = frame;
     frame_size = 0;
     addr = s->tx_descriptor;
-    while (1) {
+    while (descnt++ < FEC_MAX_DESC) {
         mcf_fec_read_bd(&bd, addr);
         DPRINTF("tx_bd %x flags %04x len %d data %08x\n",
                 addr, bd.flags, bd.length, bd.data);
Signature · 1 line
2.5.5
Reviewed-by on v2 1/1
#1 lore raw
Quoted 40 lines · P J P

From: Prasad J Pandit <[email protected]>

ColdFire Fast Ethernet Controller uses buffer descriptors to manage data flow to/fro receive & transmit queues. While transmitting packets, it could continue to read buffer descriptors if a buffer descriptor has length of zero and has crafted values in bd.flags. Set upper limit to number of buffer descriptors.

---
 hw/net/mcf_fec.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Update per
-> https://lists.gnu.org/archive/html/qemu-devel/2016-09/msg05284.html

hw/net/mcf_fec.c +2 -1
index 7c0398e..6d3418e 100644
@@ -23,6 +23,7 @@ do { printf("mcf_fec: " fmt , ## __VA_ARGS__); } while (0)
 #define DPRINTF(fmt, ...) do {} while(0)
 #endif
 
+#define FEC_MAX_DESC 1024
 #define FEC_MAX_FRAME_SIZE 2032
 
 typedef struct {
@@ -149,7 +150,7 @@ static void mcf_fec_do_tx(mcf_fec_state *s)
     uint32_t addr;
     mcf_fec_bd bd;
     int frame_size;
-    int len;
+    int len, descnt = 0;
     uint8_t frame[FEC_MAX_FRAME_SIZE];
     uint8_t *ptr;
 

hw/net/mcf_fec.c static void mcf_fec_do_tx(mcf_fec_state *s) · line 164

Quoted 8 lines
hw/net/mcf_fec.c +1 -1
@@ -157,7 +158,7 @@ static void mcf_fec_do_tx(mcf_fec_state *s)
     ptr = frame;
     frame_size = 0;
     addr = s->tx_descriptor;
-    while (1) {
+    while (descnt++ < FEC_MAX_DESC) {
         mcf_fec_read_bd(&bd, addr);
         DPRINTF("tx_bd %x flags %04x len %d data %08x\n",
                 addr, bd.flags, bd.length, bd.data);
Applied
#2 lore raw
Quoted 40 lines · Paolo Bonzini
Quoted 38 lines · P J P

From: Prasad J Pandit <[email protected]>

ColdFire Fast Ethernet Controller uses buffer descriptors to manage data flow to/fro receive & transmit queues. While transmitting packets, it could continue to read buffer descriptors if a buffer descriptor has length of zero and has crafted values in bd.flags. Set upper limit to number of buffer descriptors.

---
  hw/net/mcf_fec.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)

Update per
-> https://lists.gnu.org/archive/html/qemu-devel/2016-09/msg05284.html

hw/net/mcf_fec.c +2 -1
index 7c0398e..6d3418e 100644
@@ -23,6 +23,7 @@ do { printf("mcf_fec: " fmt , ## __VA_ARGS__); } while (0)
  #define DPRINTF(fmt, ...) do {} while(0)
  #endif
 
+#define FEC_MAX_DESC 1024
  #define FEC_MAX_FRAME_SIZE 2032
 
  typedef struct {
@@ -149,7 +150,7 @@ static void mcf_fec_do_tx(mcf_fec_state *s)
      uint32_t addr;
      mcf_fec_bd bd;
      int frame_size;
-    int len;
+    int len, descnt = 0;
      uint8_t frame[FEC_MAX_FRAME_SIZE];
      uint8_t *ptr;
 
Quoted 11 lines

hw/net/mcf_fec.c static void mcf_fec_do_tx(mcf_fec_state *s) · line 164

Quoted 10 lines
hw/net/mcf_fec.c +1 -1
@@ -157,7 +158,7 @@ static void mcf_fec_do_tx(mcf_fec_state *s)
      ptr = frame;
      frame_size = 0;
      addr = s->tx_descriptor;
-    while (1) {
+    while (descnt++ < FEC_MAX_DESC) {
          mcf_fec_read_bd(&bd, addr);
          DPRINTF("tx_bd %x flags %04x len %d data %08x\n",
                  addr, bd.flags, bd.length, bd.data);

Applied, thanks.