Преглед на файлове

Kernel: Fix USB hotplug crash

Currently the SysFS node for USB devices is only initialized for USB
hubs, which means it will cause a kernel crash upon being dereferenced
in a non-hub device. This fixes the problem by making initialization
happen for all USB devices.
b14ckcat преди 3 години
родител
ревизия
4b1537387f
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 0
      Kernel/Bus/USB/USBDevice.cpp
  2. 0 2
      Kernel/Bus/USB/USBHub.cpp

+ 2 - 0
Kernel/Bus/USB/USBDevice.cpp

@@ -20,6 +20,8 @@ ErrorOr<NonnullRefPtr<Device>> Device::try_create(USBController const& controlle
 {
     auto pipe = TRY(Pipe::try_create_pipe(controller, Pipe::Type::Control, Pipe::Direction::Bidirectional, 0, 8, 0));
     auto device = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) Device(controller, port, speed, move(pipe))));
+    auto sysfs_node = TRY(SysFSUSBDeviceInformation::create(*device));
+    device->m_sysfs_device_info_node = move(sysfs_node);
     TRY(device->enumerate_device());
     return device;
 }

+ 0 - 2
Kernel/Bus/USB/USBHub.cpp

@@ -45,8 +45,6 @@ ErrorOr<void> Hub::enumerate_and_power_on_hub()
     // USBDevice::enumerate_device must be called before this.
     VERIFY(m_address > 0);
 
-    m_sysfs_device_info_node = TRY(SysFSUSBDeviceInformation::create(*this));
-
     if (m_device_descriptor.device_class != USB_CLASS_HUB) {
         dbgln("USB Hub: Trying to enumerate and power on a device that says it isn't a hub.");
         return EINVAL;