Explorar el Código

Kernel: Make UHCIController::spawn_port_process OOM-fallible

Idan Horowitz hace 3 años
padre
commit
c131e69748

+ 4 - 8
Kernel/Bus/USB/UHCI/UHCIController.cpp

@@ -76,7 +76,7 @@ ErrorOr<void> UHCIController::initialize()
     dmesgln("UHCI: I/O base {}", m_io_base);
     dmesgln("UHCI: I/O base {}", m_io_base);
     dmesgln("UHCI: Interrupt line: {}", interrupt_number());
     dmesgln("UHCI: Interrupt line: {}", interrupt_number());
 
 
-    spawn_port_process();
+    TRY(spawn_port_process());
 
 
     TRY(reset());
     TRY(reset());
     return start();
     return start();
@@ -464,15 +464,10 @@ size_t UHCIController::poll_transfer_queue(QueueHead& transfer_queue)
     return transfer_size;
     return transfer_size;
 }
 }
 
 
-void UHCIController::spawn_port_process()
+ErrorOr<void> UHCIController::spawn_port_process()
 {
 {
     RefPtr<Thread> usb_hotplug_thread;
     RefPtr<Thread> usb_hotplug_thread;
-
-    auto process_name = KString::try_create("UHCI hotplug");
-    if (process_name.is_error())
-        TODO();
-
-    (void)Process::create_kernel_process(usb_hotplug_thread, process_name.release_value(), [&] {
+    (void)Process::create_kernel_process(usb_hotplug_thread, TRY(KString::try_create("UHCI hotplug")), [&] {
         for (;;) {
         for (;;) {
             if (m_root_hub)
             if (m_root_hub)
                 m_root_hub->check_for_port_updates();
                 m_root_hub->check_for_port_updates();
@@ -480,6 +475,7 @@ void UHCIController::spawn_port_process()
             (void)Thread::current()->sleep(Time::from_seconds(1));
             (void)Thread::current()->sleep(Time::from_seconds(1));
         }
         }
     });
     });
+    return {};
 }
 }
 
 
 bool UHCIController::handle_irq(const RegisterState&)
 bool UHCIController::handle_irq(const RegisterState&)

+ 1 - 1
Kernel/Bus/USB/UHCI/UHCIController.h

@@ -42,7 +42,7 @@ public:
     virtual ErrorOr<void> reset() override;
     virtual ErrorOr<void> reset() override;
     virtual ErrorOr<void> stop() override;
     virtual ErrorOr<void> stop() override;
     virtual ErrorOr<void> start() override;
     virtual ErrorOr<void> start() override;
-    void spawn_port_process();
+    ErrorOr<void> spawn_port_process();
 
 
     virtual ErrorOr<size_t> submit_control_transfer(Transfer& transfer) override;
     virtual ErrorOr<size_t> submit_control_transfer(Transfer& transfer) override;