net: imx: limit buffer descriptor count
PATCH v3 1/1 net: imx: limit buffer descriptor count
From: Prasad J Pandit <[email protected]>
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.
--- hw/net/imx_fec.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
Patch v2
-> https://lists.gnu.org/archive/html/qemu-devel/2016-09/msg05554.html
- Restrict loop in 'imx_enet_do_tx' to IMX_MAX_DESC descriptors.
hw/net/imx_fec.c +6 -4
@@ -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;
Signature · 1 line
2.9.3
Jason Wang
AppliedQuoted 10 lines · P J P
From: Prasad J Pandit <[email protected]>
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 <[email protected]>Signed-off-by Prasad J Pandit <[email protected]>
Quoted 7 lines
--- hw/net/imx_fec.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)Patch v2
-> https://lists.gnu.org/archive/html/qemu-devel/2016-09/msg05554.html
- Restrict loop in 'imx_enet_do_tx' toIMX_MAX_DESCdescriptors.
Applied, thanks.
Quoted 44 lines
hw/net/imx_fec.c +6
-4@@ -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;