2 files changed, 34 insertions, 3 deletions

diff --git a/kernel/src/devices/block_device_utils.cpp b/kernel/src/devices/block_device_utils.cpp
index a1fd5e3..59e9b97 100644
--- a/kernel/src/devices/block_device_utils.cpp
+++ b/kernel/src/devices/block_device_utils.cpp
@@ -31,12 +31,13 @@ namespace kernel::devices::block_device_utils
       return 0;
     }
 
-    auto * block_dev = static_cast<devices::block_device *>(device.get());
-    if (block_dev == nullptr)
+    if (!device->is_block_device())
     {
       kapi::system::panic("[FILESYSTEM] device_file: expected block_device.");
     }
 
+    auto * block_dev = static_cast<devices::block_device *>(device.get());
+
     size_t const block_size = block_dev->block_size();
     size_t const capacity = block_dev->capacity();
 
diff --git a/kernel/src/devices/block_device_utils.tests.cpp b/kernel/src/devices/block_device_utils.tests.cpp
index 5f27a9b..f78e477 100644
--- a/kernel/src/devices/block_device_utils.tests.cpp
+++ b/kernel/src/devices/block_device_utils.tests.cpp
@@ -2,6 +2,7 @@
 
 #include "kernel/test_support/cpu.hpp"
 #include "kernel/test_support/devices/block_device.hpp"
+#include "kernel/test_support/devices/character_device.hpp"
 
 #include <kstd/memory>
 #include <kstd/print>
@@ -186,4 +187,33 @@ SCENARIO("writing to a block device using block_device_utils", "[devices][block_
       }
     }
   }
-}
\ No newline at end of file
+}
+
+SCENARIO("block_device_utils with a non-block device", "[devices][block_device_utils]")
+{
+  GIVEN("a non-block device")
+  {
+    auto device = kstd::make_shared<kernel::tests::devices::character_device>(0, 0, "test_character_device");
+
+    WHEN("attempting to read from the non-block device using block_device_utils")
+    {
+      kstd::vector<uint8_t> read_buffer(512);
+      THEN("the system panics")
+      {
+        REQUIRE_THROWS_AS(kernel::devices::block_device_utils::read(device, read_buffer.data(), 0, read_buffer.size()),
+                          kernel::tests::cpu::halt);
+      }
+    }
+
+    WHEN("attempting to write to the non-block device using block_device_utils")
+    {
+      kstd::vector<uint8_t> write_buffer(512);
+      THEN("the system panics")
+      {
+        REQUIRE_THROWS_AS(
+            kernel::devices::block_device_utils::write(device, write_buffer.data(), 0, write_buffer.size()),
+            kernel::tests::cpu::halt);
+      }
+    }
+  }
+}