| Message ID | 1480360119-12316-1-git-send-email-ppandit@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 2016年11月29日 03:08, P J P wrote: > From: Prasad J Pandit <pjp@fedoraproject.org> > > ColdFire Fast Ethernet Controller uses a receive buffer size > register(EMRBR) to hold maximum size of all receive buffers. > It is set by a user before any operation. If it was set to be > zero, ColdFire emulator would go into an infinite loop while > receiving data in mcf_fec_receive. Add check to avoid it. > > Reported-by: Wjjzhang <wjjzhang@tencent.com> > Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org> > --- > hw/net/mcf_fec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c > index 0ee8ad9..13631e0 100644 > --- a/hw/net/mcf_fec.c > +++ b/hw/net/mcf_fec.c > @@ -392,7 +392,7 @@ static void mcf_fec_write(void *opaque, hwaddr addr, > s->tx_descriptor = s->etdsr; > break; > case 0x188: > - s->emrbr = value & 0x7f0; > + s->emrbr = value > 0 ? value & 0x7F0 : 0x7F0; > break; > default: > hw_error("mcf_fec_write Bad address 0x%x\n", (int)addr); Applied, thanks.
diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index 0ee8ad9..13631e0 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -392,7 +392,7 @@ static void mcf_fec_write(void *opaque, hwaddr addr, s->tx_descriptor = s->etdsr; break; case 0x188: - s->emrbr = value & 0x7f0; + s->emrbr = value > 0 ? value & 0x7F0 : 0x7F0; break; default: hw_error("mcf_fec_write Bad address 0x%x\n", (int)addr);