[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/5] net: imx: limit buffer descriptor count
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 4/5] net: imx: limit buffer descriptor count |
Date: |
Wed, 15 Feb 2017 11:53:21 +0800 |
From: Prasad J Pandit <address@hidden>
i.MX 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 an upper limit to number of buffer descriptors.
Reported-by: Li Qiang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/imx_fec.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c
index 50c7564..90e6ee3 100644
--- a/hw/net/imx_fec.c
+++ b/hw/net/imx_fec.c
@@ -55,6 +55,8 @@
} \
} while (0)
+#define IMX_MAX_DESC 1024
+
static const char *imx_default_reg_name(IMXFECState *s, uint32_t index)
{
static char tmp[20];
@@ -402,12 +404,12 @@ static void imx_eth_update(IMXFECState *s)
static void imx_fec_do_tx(IMXFECState *s)
{
- int frame_size = 0;
+ int frame_size = 0, descnt = 0;
uint8_t frame[ENET_MAX_FRAME_SIZE];
uint8_t *ptr = frame;
uint32_t addr = s->tx_descriptor;
- while (1) {
+ while (descnt++ < IMX_MAX_DESC) {
IMXFECBufDesc bd;
int len;
@@ -453,12 +455,12 @@ static void imx_fec_do_tx(IMXFECState *s)
static void imx_enet_do_tx(IMXFECState *s)
{
- int frame_size = 0;
+ int frame_size = 0, descnt = 0;
uint8_t frame[ENET_MAX_FRAME_SIZE];
uint8_t *ptr = frame;
uint32_t addr = s->tx_descriptor;
- while (1) {
+ while (descnt++ < IMX_MAX_DESC) {
IMXENETBufDesc bd;
int len;
--
2.7.4
- [Qemu-devel] [PULL 0/5] Net patches, Jason Wang, 2017/02/14
- [Qemu-devel] [PULL 1/5] net: Mark 'vlan' parameter as deprecated, Jason Wang, 2017/02/14
- [Qemu-devel] [PULL 2/5] net: e1000e: fix dead code in e1000e_write_packet_to_guest, Jason Wang, 2017/02/14
- [Qemu-devel] [PULL 3/5] colo-compare: sort TCP packet queue by sequence number, Jason Wang, 2017/02/14
- [Qemu-devel] [PULL 4/5] net: imx: limit buffer descriptor count,
Jason Wang <=
- [Qemu-devel] [PULL 5/5] net: e1000e: fix an infinite loop issue, Jason Wang, 2017/02/14
- Re: [Qemu-devel] [PULL 0/5] Net patches, Peter Maydell, 2017/02/16