mirror of
https://github.com/Atmosphere-NX/Atmosphere
synced 2024-12-22 12:21:18 +00:00
os: add UnsafeMemory apis
This commit is contained in:
parent
f636596ee2
commit
982389dceb
6 changed files with 147 additions and 0 deletions
|
@ -29,6 +29,7 @@
|
||||||
#include <stratosphere/os/os_process_memory_api.hpp>
|
#include <stratosphere/os/os_process_memory_api.hpp>
|
||||||
#include <stratosphere/os/os_process_code_memory_api.hpp>
|
#include <stratosphere/os/os_process_code_memory_api.hpp>
|
||||||
#include <stratosphere/os/os_insecure_memory_api.hpp>
|
#include <stratosphere/os/os_insecure_memory_api.hpp>
|
||||||
|
#include <stratosphere/os/os_unsafe_memory_api.hpp>
|
||||||
#include <stratosphere/os/os_random.hpp>
|
#include <stratosphere/os/os_random.hpp>
|
||||||
#include <stratosphere/os/os_mutex.hpp>
|
#include <stratosphere/os/os_mutex.hpp>
|
||||||
#include <stratosphere/os/os_condition_variable.hpp>
|
#include <stratosphere/os/os_condition_variable.hpp>
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) Atmosphère-NX
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms and conditions of the GNU General Public License,
|
||||||
|
* version 2, as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||||
|
* more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#include <stratosphere/os/os_memory_common.hpp>
|
||||||
|
|
||||||
|
namespace ams::os {
|
||||||
|
|
||||||
|
Result AllocateUnsafeMemory(uintptr_t *out_address, size_t size);
|
||||||
|
Result FreeUnsafeMemory(uintptr_t address, size_t size);
|
||||||
|
|
||||||
|
}
|
|
@ -24,6 +24,7 @@ namespace ams::os::impl {
|
||||||
R_RETURN(impl::GetAslrSpaceManager().MapAtRandomAddress(out_address,
|
R_RETURN(impl::GetAslrSpaceManager().MapAtRandomAddress(out_address,
|
||||||
[](uintptr_t map_address, size_t map_size) -> Result {
|
[](uintptr_t map_address, size_t map_size) -> Result {
|
||||||
R_TRY_CATCH(svc::MapInsecureMemory(map_address, map_size)) {
|
R_TRY_CATCH(svc::MapInsecureMemory(map_address, map_size)) {
|
||||||
|
R_CONVERT(svc::ResultOutOfMemory, os::ResultOutOfMemory())
|
||||||
R_CONVERT(svc::ResultInvalidCurrentMemory, os::ResultInvalidCurrentMemoryState())
|
R_CONVERT(svc::ResultInvalidCurrentMemory, os::ResultInvalidCurrentMemoryState())
|
||||||
} R_END_TRY_CATCH_WITH_ABORT_UNLESS;
|
} R_END_TRY_CATCH_WITH_ABORT_UNLESS;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) Atmosphère-NX
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms and conditions of the GNU General Public License,
|
||||||
|
* version 2, as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||||
|
* more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
#include <stratosphere.hpp>
|
||||||
|
|
||||||
|
namespace ams::os::impl {
|
||||||
|
|
||||||
|
class UnsafeMemoryImpl {
|
||||||
|
public:
|
||||||
|
static Result AllocateUnsafeMemoryImpl(uintptr_t *out_address, size_t size);
|
||||||
|
static Result FreeUnsafeMemoryImpl(uintptr_t address, size_t size);
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,54 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) Atmosphère-NX
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms and conditions of the GNU General Public License,
|
||||||
|
* version 2, as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||||
|
* more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
#include <stratosphere.hpp>
|
||||||
|
#include "os_unsafe_memory_impl.hpp"
|
||||||
|
#include "os_aslr_space_manager.hpp"
|
||||||
|
|
||||||
|
namespace ams::os::impl {
|
||||||
|
|
||||||
|
Result UnsafeMemoryImpl::AllocateUnsafeMemoryImpl(uintptr_t *out_address, size_t size) {
|
||||||
|
/* Map at a random address. */
|
||||||
|
R_RETURN(impl::GetAslrSpaceManager().MapAtRandomAddress(out_address,
|
||||||
|
[](uintptr_t map_address, size_t map_size) -> Result {
|
||||||
|
R_TRY_CATCH(svc::MapPhysicalMemoryUnsafe(map_address, map_size)) {
|
||||||
|
R_CONVERT(svc::ResultOutOfResource, os::ResultOutOfResource())
|
||||||
|
R_CONVERT(svc::ResultOutOfMemory, os::ResultOutOfMemory())
|
||||||
|
R_CONVERT(svc::ResultInvalidCurrentMemory, os::ResultInvalidCurrentMemoryState())
|
||||||
|
R_CONVERT(svc::ResultLimitReached, os::ResultOutOfMemory())
|
||||||
|
} R_END_TRY_CATCH_WITH_ABORT_UNLESS;
|
||||||
|
|
||||||
|
R_SUCCEED();
|
||||||
|
},
|
||||||
|
[](uintptr_t map_address, size_t map_size) -> void {
|
||||||
|
R_ABORT_UNLESS(UnsafeMemoryImpl::FreeUnsafeMemoryImpl(map_address, map_size));
|
||||||
|
},
|
||||||
|
size,
|
||||||
|
0
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
Result UnsafeMemoryImpl::FreeUnsafeMemoryImpl(uintptr_t address, size_t size) {
|
||||||
|
R_TRY_CATCH(svc::UnmapPhysicalMemoryUnsafe(address, size)) {
|
||||||
|
R_CONVERT(svc::ResultOutOfResource, os::ResultOutOfResource())
|
||||||
|
R_CONVERT(svc::ResultOutOfMemory, os::ResultOutOfResource())
|
||||||
|
R_CONVERT(svc::ResultInvalidCurrentMemory, os::ResultBusy())
|
||||||
|
R_CONVERT(svc::ResultInvalidMemoryRegion, os::ResultInvalidParameter())
|
||||||
|
} R_END_TRY_CATCH_WITH_ABORT_UNLESS;
|
||||||
|
|
||||||
|
R_SUCCEED();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
39
libraries/libstratosphere/source/os/os_unsafe_memory.cpp
Normal file
39
libraries/libstratosphere/source/os/os_unsafe_memory.cpp
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) Atmosphère-NX
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms and conditions of the GNU General Public License,
|
||||||
|
* version 2, as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||||
|
* more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
#include <stratosphere.hpp>
|
||||||
|
#include "impl/os_unsafe_memory_impl.hpp"
|
||||||
|
|
||||||
|
namespace ams::os {
|
||||||
|
|
||||||
|
Result AllocateUnsafeMemory(uintptr_t *out_address, size_t size) {
|
||||||
|
/* Check arguments. */
|
||||||
|
AMS_ASSERT(size > 0);
|
||||||
|
AMS_ASSERT(util::IsAligned(size, os::MemoryPageSize));
|
||||||
|
|
||||||
|
/* Allocate memory. */
|
||||||
|
R_RETURN(impl::UnsafeMemoryImpl::AllocateUnsafeMemoryImpl(out_address, size));
|
||||||
|
}
|
||||||
|
|
||||||
|
Result FreeUnsafeMemory(uintptr_t address, size_t size) {
|
||||||
|
/* Check arguments. */
|
||||||
|
AMS_ASSERT(util::IsAligned(address, os::MemoryPageSize));
|
||||||
|
AMS_ASSERT(util::IsAligned(size, os::MemoryPageSize));
|
||||||
|
|
||||||
|
/* Free memory. */
|
||||||
|
R_RETURN(impl::UnsafeMemoryImpl::FreeUnsafeMemoryImpl(address, size));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in a new issue