From 0c8b7c00e8aa0749bdf4c689790ad7a2830cf760 Mon Sep 17 00:00:00 2001 From: Subv Date: Tue, 1 May 2018 14:54:15 -0500 Subject: [PATCH] GPU: Don't write to invalid memory locations when handling ioctls that don't have an output. --- src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp | 2 -- src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp | 3 --- 2 files changed, 5 deletions(-) diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp index 36d7f837b4..a7097bd235 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp @@ -39,7 +39,6 @@ u32 nvhost_as_gpu::InitalizeEx(const std::vector& input, std::vector& ou IoctlInitalizeEx params{}; std::memcpy(¶ms, input.data(), input.size()); NGLOG_WARNING(Service_NVDRV, "(STUBBED) called, big_page_size={:#X}", params.big_page_size); - std::memcpy(output.data(), ¶ms, output.size()); return 0; } @@ -135,7 +134,6 @@ u32 nvhost_as_gpu::BindChannel(const std::vector& input, std::vector& ou std::memcpy(¶ms, input.data(), input.size()); NGLOG_DEBUG(Service_NVDRV, "called, fd={:X}", params.fd); channel = params.fd; - std::memcpy(output.data(), ¶ms, output.size()); return 0; } diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp index 70625211ee..9fee7d5648 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp @@ -49,7 +49,6 @@ u32 nvhost_gpu::SetNVMAPfd(const std::vector& input, std::vector& output std::memcpy(¶ms, input.data(), input.size()); NGLOG_DEBUG(Service_NVDRV, "called, fd={}", params.nvmap_fd); nvmap_fd = params.nvmap_fd; - std::memcpy(output.data(), ¶ms, output.size()); return 0; } @@ -58,7 +57,6 @@ u32 nvhost_gpu::SetClientData(const std::vector& input, std::vector& out IoctlClientData params{}; std::memcpy(¶ms, input.data(), input.size()); user_data = params.data; - std::memcpy(output.data(), ¶ms, output.size()); return 0; } @@ -91,7 +89,6 @@ u32 nvhost_gpu::SetErrorNotifier(const std::vector& input, std::vector& u32 nvhost_gpu::SetChannelPriority(const std::vector& input, std::vector& output) { std::memcpy(&channel_priority, input.data(), input.size()); NGLOG_DEBUG(Service_NVDRV, "(STUBBED) called, priority={:X}", channel_priority); - std::memcpy(output.data(), &channel_priority, output.size()); return 0; }