Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
hw
/
net
/
stellaris_enet.c
diff --git
a/qemu/hw/net/stellaris_enet.c
b/qemu/hw/net/stellaris_enet.c
index
21a4773
..
6880894
100644
(file)
--- a/
qemu/hw/net/stellaris_enet.c
+++ b/
qemu/hw/net/stellaris_enet.c
@@
-6,6
+6,7
@@
*
* This code is licensed under the GPL.
*/
*
* This code is licensed under the GPL.
*/
+#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include <zlib.h>
#include "hw/sysbus.h"
#include "net/net.h"
#include <zlib.h>
@@
-235,8
+236,18
@@
static ssize_t stellaris_enet_receive(NetClientState *nc, const uint8_t *buf, si
n = s->next_packet + s->np;
if (n >= 31)
n -= 31;
n = s->next_packet + s->np;
if (n >= 31)
n -= 31;
- s->np++;
+ if (size >= sizeof(s->rx[n].data) - 6) {
+ /* If the packet won't fit into the
+ * emulated 2K RAM, this is reported
+ * as a FIFO overrun error.
+ */
+ s->ris |= SE_INT_FOV;
+ stellaris_enet_update(s);
+ return -1;
+ }
+
+ s->np++;
s->rx[n].len = size + 6;
p = s->rx[n].data;
*(p++) = (size + 6);
s->rx[n].len = size + 6;
p = s->rx[n].data;
*(p++) = (size + 6);