Merge pull request #6143 from lat9nq/nvhost_null_memcpy

nvhost_ctrl_gpu: Avoid sending null pointer to memcpy
This commit is contained in:
bunnei 2021-04-07 16:50:22 -07:00 committed by GitHub
commit 262a70223f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -248,7 +248,13 @@ NvResult nvhost_ctrl_gpu::ZBCSetTable(const std::vector<u8>& input, std::vector<
IoctlZbcSetTable params{}; IoctlZbcSetTable params{};
std::memcpy(&params, input.data(), input.size()); std::memcpy(&params, input.data(), input.size());
// TODO(ogniK): What does this even actually do? // TODO(ogniK): What does this even actually do?
// Prevent null pointer being passed as arg 1
if (output.empty()) {
LOG_WARNING(Service_NVDRV, "Avoiding passing null pointer to memcpy");
} else {
std::memcpy(output.data(), &params, output.size()); std::memcpy(output.data(), &params, output.size());
}
return NvResult::Success; return NvResult::Success;
} }