Commit b628d611 authored by Gao Feng's avatar Gao Feng Committed by David S. Miller

8139cp: Fix one possible deadloop in cp_rx_poll

When cp_rx_poll does not get enough packet, it will check the rx
interrupt status again. If so, it will jumpt to rx_status_loop again.
But the goto jump resets the rx variable as zero too.

As a result, it causes one possible deadloop. Assume this case,
rx_status_loop only gets the packet count which is less than budget,
and (cpr16(IntrStatus) & cp_rx_intr_mask) condition is always true.
It causes the deadloop happens and system is blocked.
Signed-off-by: default avatarGao Feng <fgao@ikuai8.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f38ff2ee
...@@ -467,8 +467,8 @@ static int cp_rx_poll(struct napi_struct *napi, int budget) ...@@ -467,8 +467,8 @@ static int cp_rx_poll(struct napi_struct *napi, int budget)
unsigned int rx_tail = cp->rx_tail; unsigned int rx_tail = cp->rx_tail;
int rx; int rx;
rx_status_loop:
rx = 0; rx = 0;
rx_status_loop:
cpw16(IntrStatus, cp_rx_intr_mask); cpw16(IntrStatus, cp_rx_intr_mask);
while (rx < budget) { while (rx < budget) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment