From 8dfd1247187a30b9310be6d55edc64dae6ce7631 Mon Sep 17 00:00:00 2001
From: Idan Horowitz <idan.horowitz@gmail.com>
Date: Mon, 24 Jan 2022 18:02:09 +0200
Subject: [PATCH] Kernel: Replace String with NonnullOwnPtr<KString> in
 sys$getkeymap

---
 Kernel/Syscalls/keymap.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Kernel/Syscalls/keymap.cpp b/Kernel/Syscalls/keymap.cpp
index 6a8645351c..613d789117 100644
--- a/Kernel/Syscalls/keymap.cpp
+++ b/Kernel/Syscalls/keymap.cpp
@@ -43,7 +43,7 @@ ErrorOr<FlatPtr> Process::sys$getkeymap(Userspace<const Syscall::SC_getkeymap_pa
     TRY(require_promise(Pledge::getkeymap));
     auto params = TRY(copy_typed_from_user(user_params));
 
-    String keymap_name = HIDManagement::the().keymap_name();
+    auto keymap_name = TRY(KString::try_create(HIDManagement::the().keymap_name()));
     Keyboard::CharacterMapData const& character_maps = HIDManagement::the().character_map();
 
     TRY(copy_to_user(params.map, character_maps.map, CHAR_MAP_SIZE * sizeof(u32)));
@@ -52,9 +52,9 @@ ErrorOr<FlatPtr> Process::sys$getkeymap(Userspace<const Syscall::SC_getkeymap_pa
     TRY(copy_to_user(params.altgr_map, character_maps.altgr_map, CHAR_MAP_SIZE * sizeof(u32)));
     TRY(copy_to_user(params.shift_altgr_map, character_maps.shift_altgr_map, CHAR_MAP_SIZE * sizeof(u32)));
 
-    if (params.map_name.size < keymap_name.length())
+    if (params.map_name.size < keymap_name->length())
         return ENAMETOOLONG;
-    TRY(copy_to_user(params.map_name.data, keymap_name.characters(), keymap_name.length()));
+    TRY(copy_to_user(params.map_name.data, keymap_name->characters(), keymap_name->length()));
     return 0;
 }