Changeset 56120 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

Timestamp:

May 28, 2015 5:53:48 AM (10 years ago)

Author:

vboxsync

Message:

IntNet/NetFlt: Fix a bug accidentally introduced in unsuspecting
r87651. We ignored all netdev events except NETDEV_REGISTER because
we compared wrong pointers looking for "our" device.

Public ticket #12264 looks like one likely manifestation.
Variable reuse is bad, m'kay...

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (3 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -1825 +1825 @@
 {
     PVBOXNETFLTINS      pThis = VBOX_FLT_NB_TO_INST(self);
+    struct net_device  *pMyDev = ASMAtomicUoReadPtrT(&pThis->u.s.pDev, struct net_device *);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
     struct net_device  *pDev  = netdev_notifier_info_to_dev(ptr);
@@ -1833 +1834 @@
 
     Log(("VBoxNetFlt: got event %s(0x%lx) on %s, pDev=%p pThis=%p pThis->u.s.pDev=%p\n",
-         vboxNetFltLinuxGetNetDevEventName(ulEventType), ulEventType, pDev->name, pDev, pThis, ASMAtomicUoReadPtrT(&pThis->u.s.pDev, struct net_device *)));
+         vboxNetFltLinuxGetNetDevEventName(ulEventType), ulEventType, pDev->name, pDev, pThis, pMyDev));
+
     if (    ulEventType == NETDEV_REGISTER
         && !strcmp(pDev->name, pThis->szName))
@@ -1841 +1843 @@
     else
     {
-        pDev = ASMAtomicUoReadPtrT(&pThis->u.s.pDev, struct net_device *);
-        if (pDev == ptr)
+        if (pDev == pMyDev)
         {
             switch (ulEventType)