qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] net: mcf: check receive buffer size register value
@ 2016-11-28 19:08 P J P
  2016-11-30  9:34 ` Jason Wang
  0 siblings, 1 reply; 2+ messages in thread
From: P J P @ 2016-11-28 19:08 UTC (permalink / raw)
  To: Qemu Developers; +Cc: Jason Wang, Wjjzhang, Prasad J Pandit

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);
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Qemu-devel] [PATCH] net: mcf: check receive buffer size register value
  2016-11-28 19:08 [Qemu-devel] [PATCH] net: mcf: check receive buffer size register value P J P
@ 2016-11-30  9:34 ` Jason Wang
  0 siblings, 0 replies; 2+ messages in thread
From: Jason Wang @ 2016-11-30  9:34 UTC (permalink / raw)
  To: P J P, Qemu Developers; +Cc: Wjjzhang, Prasad J Pandit



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.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-11-30  9:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-28 19:08 [Qemu-devel] [PATCH] net: mcf: check receive buffer size register value P J P
2016-11-30  9:34 ` Jason Wang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).