Ticket #3124: fbsd_compat.diff

src/system/kernel/device_manager/devfs.cpp

@@ -215 +215 @@
 {
     struct devfs_vnode* vnode;
 
+    if (name[0] < 0)
+        panic("devfs_create_vnode: name[0] < 0");
+
     vnode = (struct devfs_vnode*)malloc(sizeof(struct devfs_vnode));
     if (vnode == NULL)
         return NULL;

src/system/kernel/fs/vfs.cpp

@@ -5470 +5470 @@
             return B_BAD_ADDRESS;
 
         ASSERT(entry->d_reclen >= sizeof(struct dirent));
+        ASSERT(entry->d_reclen <= sizeof(buffer));
 
         if (user_memcpy(entry->d_name, userEntry->d_name,
-                entry->d_reclen - sizeof(struct dirent)) != B_OK)
+                entry->d_reclen - sizeof(struct dirent) + 1) != B_OK)
             return B_BAD_ADDRESS;
     } else
         entry = userEntry;

src/libs/compat/freebsd_network/if.c

@@ -101 +101 @@
     driver_printf("%s: /dev/%s\n", gDriverName, ifp->device_name);
 
     gDeviceNameList[ifp->if_index] = ifp->device_name;
+    ktrace_printf("if_initname: gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
     gDevices[ifp->if_index] = ifp;
 
     ifp->root_device = find_root_device(unit);
@@ -309 +310 @@
 void
 ether_ifattach(struct ifnet *ifp, const uint8_t *macAddress)
 {
+    ktrace_printf("ether_ifattach: a: gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
     ifp->if_addrlen = ETHER_ADDR_LEN;
     ifp->if_hdrlen = ETHER_HDR_LEN;
     if_attach(ifp);
@@ -324 +326 @@
     //      once all drivers are cleaned up.
     if (macAddress != IFP2ENADDR(ifp))
         memcpy(IFP2ENADDR(ifp), macAddress, ETHER_ADDR_LEN);
+    ktrace_printf("ether_ifattach: b: gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
 }
 
 

src/libs/compat/freebsd_network/device.c

@@ -33 +33 @@
             break;
     }
 
+    ktrace_printf("compat_open: gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
+
     if (gDeviceNameList[i] == NULL)
         return B_ERROR;
 

src/libs/compat/freebsd_network/compat/sys/haiku-module.h

@@ -74 +74 @@
     void uninit_driver()                                                \
         { _fbsd_uninit_driver(DRIVER_MODULE_NAME(name, busname)); }     \
     const char **publish_devices()                                      \
-        { return gDeviceNameList; }                                     \
+        { ktrace_printf("publish_devices: gDeviceNameList[0]=%s\n", gDeviceNameList[0]); return gDeviceNameList; }                                      \
     device_hooks *find_device(const char *name)                         \
         { return &gDeviceHooks; }
 

src/libs/compat/freebsd_network/compat.c

@@ -377 +377 @@
     if (result == 0)
         atomic_or(&device->flags, DEVICE_ATTACHED);
 
+    ktrace_printf("device_attach: gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
+
     return result;
 }
 
@@ -404 +406 @@
 bus_generic_attach(device_t dev)
 {
     device_t child = NULL;
+    ktrace_printf("bus_generic_attach: a: gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
 
     while ((child = list_get_next_item(&dev->children, child)) != NULL) {
         if (child->driver == NULL) {
@@ -424 +427 @@
                 return result;
         }
     }
+    ktrace_printf("bus_generic_attach: b: gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
 
     return 0;
 }
@@ -433 +437 @@
 bus_generic_detach(device_t device)
 {
     device_t child = NULL;
+    ktrace_printf("bus_generic_detach: a: gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
 
     if ((device->flags & DEVICE_ATTACHED) == 0)
         return B_ERROR;
@@ -444 +449 @@
 
         device_detach(child);
     }
+    ktrace_printf("bus_generic_detach: b: gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
 
     return 0;
 }

src/libs/compat/freebsd_network/driver.c

@@ -58 +58 @@
         device_delete_child(NULL, root);
         return B_NO_MEMORY;
     }
+    ktrace_printf("init_root_device: gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
 
     root->driver = &sRootDriver;
     root->root = root;
@@ -125 +126 @@
             break;
         }
     }
+    ktrace_printf("_fbsd_init_hardware: gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
 
     if (status < B_OK)
         TRACE(("%s: no hardware found.\n", gDriverName));
@@ -181 +183 @@
 
             if (device_attach(device) == 0)
                 found = true;
+            ktrace_printf("_fbsd_init_driver: gDeviceNameList[0]=%s\n", gDeviceNameList[0]);
 
             i++;
             break;