Changeset 78477 in vbox for trunk/src/VBox

Timestamp:

May 13, 2019 8:58:51 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

130512

Message:

PCnet: Do not access the 'user' dword of RX/TX descriptors.

File:

• trunk/src/VBox/Devices/Network/DevPCNet.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -816 +816 @@
     {
         ((uint32_t*)tmd)[1] |=  0x80000000;
-        pcnetPhysWrite(pThis, addr, (void*)tmd, 16);
+        pcnetPhysWrite(pThis, addr, (void*)tmd, 12);
         ((uint32_t*)tmd)[1] &= ~0x80000000;
         pcnetPhysWrite(pThis, addr+7, (uint8_t*)tmd + 7, 1);
@@ -822 +822 @@
     else
     {
-        uint32_t xda[4];
+        uint32_t xda[3];
         xda[0] = ((uint32_t *)tmd)[2];
         xda[1] = ((uint32_t *)tmd)[1];
         xda[2] = ((uint32_t *)tmd)[0];
-        xda[3] = ((uint32_t *)tmd)[3];
         xda[1] |=  0x80000000;
         pcnetPhysWrite(pThis, addr, (void*)&xda[0], sizeof(xda));
@@ -913 +912 @@
     {
         ((uint32_t*)rmd)[1] |=  0x80000000;
-        pcnetPhysWrite(pThis, addr, (void*)rmd, 16);
+        pcnetPhysWrite(pThis, addr, (void*)rmd, 12);
         ((uint32_t*)rmd)[1] &= ~0x80000000;
         pcnetPhysWrite(pThis, addr+7, (uint8_t*)rmd + 7, 1);
@@ -919 +918 @@
     else
     {
-        uint32_t rda[4];
+        uint32_t rda[3];
         rda[0] = ((uint32_t *)rmd)[2];
         rda[1] = ((uint32_t *)rmd)[1];
         rda[2] = ((uint32_t *)rmd)[0];
-        rda[3] = ((uint32_t *)rmd)[3];
         rda[1] |=  0x80000000;
         pcnetPhysWrite(pThis, addr, (void*)&rda[0], sizeof(rda));