]> git.proxmox.com Git - mirror_qemu.git/commitdiff
net: stellaris_enet: check packet length against receive buffer
authorPrasad J Pandit <pjp@fedoraproject.org>
Fri, 8 Apr 2016 06:03:48 +0000 (11:33 +0530)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 11 Apr 2016 13:22:33 +0000 (14:22 +0100)
When receiving packets over Stellaris ethernet controller, it
uses receive buffer of size 2048 bytes. In case the controller
accepts large(MTU) packets, it could lead to memory corruption.
Add check to avoid it.

Reported-by: Oleksandr Bazhaniuk <oleksandr.bazhaniuk@intel.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Message-id: 1460095428-22698-1-git-send-email-ppandit@redhat.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/net/stellaris_enet.c

index 84cf60b303996686eb95aa6cbafadaa5d8532585..6880894945432a104d6d7a0fa5b4d12972fe7ed6 100644 (file)
@@ -236,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;
-    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);