mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-11-18 01:46:47 +00:00
Code Issues Releases Activity

tipc: fix deserialization of buffers

Browse source
This commit is contained in:
Michael Scire 2021-04-08 17:55:25 -07:00 committed by SciresM
parent 20a7fa1588
commit e3a65b1405
2 changed files with 38 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libraries/libstratosphere/include/stratosphere/tipc/impl/tipc_impl_command_serialization.hpp
View file

@ -358,14 +358,13 @@ namespace ams::tipc::impl {
} }
} else if constexpr (arg_type == ArgumentType::Buffer) { } else if constexpr (arg_type == ArgumentType::Buffer) {
/* New Buffer, increment the appropriate index. */ /* New Buffer, increment the appropriate index. */
const auto attributes = BufferAttributes[current_info.buffer_index]; const auto attributes = BufferAttributes[current_info.buffer_index++];
current_info.buffer_index++;
if (attributes & SfBufferAttr_In) { if (attributes & SfBufferAttr_In) {
current_info.is_send_buffer = true; returned_info.is_send_buffer = true;
current_info.send_map_alias_index++; current_info.send_map_alias_index++;
} else if (attributes & SfBufferAttr_Out) { } else if (attributes & SfBufferAttr_Out) {
current_info.is_send_buffer = false; returned_info.is_send_buffer = false;
current_info.recv_map_alias_index++; current_info.recv_map_alias_index++;
} }
} else if constexpr (arg_type == ArgumentType::ProcessId) { } else if constexpr (arg_type == ArgumentType::ProcessId) {
@ -460,6 +459,9 @@ namespace ams::tipc::impl {
} }
}; };
template<size_t... Ix>
struct PrintIndex;
template<typename CommandMeta> template<typename CommandMeta>
class CommandProcessor { class CommandProcessor {
public: public:
@ -533,13 +535,13 @@ namespace ams::tipc::impl {
constexpr auto BufferIndex = CommandMeta::InMessageBufferIndex + (Info.send_map_alias_index * MapAliasDescriptorSize / sizeof(util::BitPack32)); constexpr auto BufferIndex = CommandMeta::InMessageBufferIndex + (Info.send_map_alias_index * MapAliasDescriptorSize / sizeof(util::BitPack32));
const svc::ipc::MessageBuffer::MapAliasDescriptor descriptor(message_buffer, BufferIndex); const svc::ipc::MessageBuffer::MapAliasDescriptor descriptor(message_buffer, BufferIndex);
return T(tipc::PointerAndSize(descriptor.GetAddress(), descriptor.GetSize())); return T(descriptor.GetAddress(), descriptor.GetSize());
} else { } else {
/* Input receive buffer. */ /* Input receive buffer. */
constexpr auto BufferIndex = CommandMeta::InMessageBufferIndex + ((CommandMeta::NumInBuffers + Info.recv_map_alias_index) * MapAliasDescriptorSize / sizeof(util::BitPack32)); constexpr auto BufferIndex = CommandMeta::InMessageBufferIndex + ((CommandMeta::NumInBuffers + Info.recv_map_alias_index) * MapAliasDescriptorSize / sizeof(util::BitPack32));
const svc::ipc::MessageBuffer::MapAliasDescriptor descriptor(message_buffer, BufferIndex); const svc::ipc::MessageBuffer::MapAliasDescriptor descriptor(message_buffer, BufferIndex);
return T(tipc::PointerAndSize(descriptor.GetAddress(), descriptor.GetSize())); return T(descriptor.GetAddress(), descriptor.GetSize());
} }
} else if constexpr (Info.arg_type == ArgumentType::ProcessId) { } else if constexpr (Info.arg_type == ArgumentType::ProcessId) {
return T{ os::ProcessId{ message_buffer.GetProcessId(CommandMeta::InMessageProcessIdIndex) } }; return T{ os::ProcessId{ message_buffer.GetProcessId(CommandMeta::InMessageProcessIdIndex) } };
@ -547,11 +549,6 @@ namespace ams::tipc::impl {
static_assert(!std::is_same<T, T>::value, "Invalid ArgumentType<T>"); static_assert(!std::is_same<T, T>::value, "Invalid ArgumentType<T>");
} }
} }
template<size_t... Is>
static ALWAYS_INLINE ArgsType DeserializeArgumentsImpl(const svc::ipc::MessageBuffer &message_buffer, const OutRawHolderType &out_raw_holder, OutHandleHolderType &out_handles_holder, std::index_sequence<Is...>) {
return ArgsType { DeserializeArgumentImpl<Is>(message_buffer, out_raw_holder, out_handles_holder)..., };
}
public: public:
static ALWAYS_INLINE Result ValidateCommandFormat(const svc::ipc::MessageBuffer &message_buffer) { static ALWAYS_INLINE Result ValidateCommandFormat(const svc::ipc::MessageBuffer &message_buffer) {
/* Validate the message header. */ /* Validate the message header. */
@ -568,8 +565,9 @@ namespace ams::tipc::impl {
return ResultSuccess(); return ResultSuccess();
} }
static ALWAYS_INLINE ArgsType DeserializeArguments(const svc::ipc::MessageBuffer &message_buffer, const OutRawHolderType &out_raw_holder, OutHandleHolderType &out_handles_holder) { template<size_t Ix>
return DeserializeArgumentsImpl(message_buffer, out_raw_holder, out_handles_holder, std::make_index_sequence<std::tuple_size<ArgsType>::value>{}); static ALWAYS_INLINE auto DeserializeArgument(const svc::ipc::MessageBuffer &message_buffer, const OutRawHolderType &out_raw_holder, OutHandleHolderType &out_handles_holder) {
return DeserializeArgumentImpl<Ix>(message_buffer, out_raw_holder, out_handles_holder);
} }
static ALWAYS_INLINE void SerializeResults(const svc::ipc::MessageBuffer &message_buffer, const Result &result, const OutRawHolderType &out_raw_holder, const OutHandleHolderType &out_handles_holder) { static ALWAYS_INLINE void SerializeResults(const svc::ipc::MessageBuffer &message_buffer, const Result &result, const OutRawHolderType &out_raw_holder, const OutHandleHolderType &out_handles_holder) {
@ -619,12 +617,10 @@ namespace ams::tipc::impl {
typename Processor::OutRawHolderType out_raw_holder; typename Processor::OutRawHolderType out_raw_holder;
typename Processor::OutHandleHolderType out_handles_holder; typename Processor::OutHandleHolderType out_handles_holder;
const Result command_result = [&]<size_t... Ix>(std::index_sequence<Ix...>) ALWAYS_INLINE_LAMBDA { const Result command_result = [&]<size_t... Ix>(std::index_sequence<Ix...>) ALWAYS_INLINE_LAMBDA {
auto args_tuple = Processor::DeserializeArguments(message_buffer, out_raw_holder, out_handles_holder);
if constexpr (ReturnsResult) { if constexpr (ReturnsResult) {
return (object->*ServiceCommandImpl)(std::forward<typename std::tuple_element<Ix, TrueArgumentsTuple>::type>(std::get<Ix>(args_tuple))...); return (object->*ServiceCommandImpl)(Processor::template DeserializeArgument<Ix>(message_buffer, out_raw_holder, out_handles_holder)...);
} else { } else {
(object->*ServiceCommandImpl)(std::forward<typename std::tuple_element<Ix, TrueArgumentsTuple>::type>(std::get<Ix>(args_tuple))...); (object->*ServiceCommandImpl)(Processor::template DeserializeArgument<Ix>(message_buffer, out_raw_holder, out_handles_holder)...);
return ResultSuccess(); return ResultSuccess();
} }
}(std::make_index_sequence<std::tuple_size<typename CommandMeta::ArgsType>::value>()); }(std::make_index_sequence<std::tuple_size<typename CommandMeta::ArgsType>::value>());

47
libraries/libstratosphere/source/_test/test_tipc_serializer.cpp
View file

@ -16,14 +16,20 @@
#include <stratosphere.hpp> #include <stratosphere.hpp>
#include <stratosphere/tipc/impl/tipc_autogen_interface_macros.hpp> #include <stratosphere/tipc/impl/tipc_autogen_interface_macros.hpp>
#define AMS_TEST_I_USER_INTERFACE_INTERFACE_INFO(C, H) \ #define AMS_TEST_I_USER_INTERFACE_INTERFACE_INFO(C, H) \
AMS_TIPC_METHOD_INFO(C, H, 0, Result, RegisterClient, (const tipc::ClientProcessId &client_process_id), (client_process_id)) \ AMS_TIPC_METHOD_INFO(C, H, 0, Result, RegisterClient, (const tipc::ClientProcessId &client_process_id), (client_process_id)) \
AMS_TIPC_METHOD_INFO(C, H, 1, Result, GetServiceHandle, (tipc::OutMoveHandle out_h, sm::ServiceName service), (out_h, service)) \ AMS_TIPC_METHOD_INFO(C, H, 1, Result, GetServiceHandle, (tipc::OutMoveHandle out_h, sm::ServiceName service), (out_h, service)) \
AMS_TIPC_METHOD_INFO(C, H, 2, Result, RegisterService, (tipc::OutMoveHandle out_h, sm::ServiceName service, u32 max_sessions, bool is_light), (out_h, service, max_sessions, is_light)) \ AMS_TIPC_METHOD_INFO(C, H, 2, Result, RegisterService, (tipc::OutMoveHandle out_h, sm::ServiceName service, u32 max_sessions, bool is_light), (out_h, service, max_sessions, is_light)) \
AMS_TIPC_METHOD_INFO(C, H, 3, Result, UnregisterService, (sm::ServiceName service), (service)) AMS_TIPC_METHOD_INFO(C, H, 3, Result, UnregisterService, (sm::ServiceName service), (service))
AMS_TIPC_DEFINE_INTERFACE(ams::_test::impl, IUserInterface, AMS_TEST_I_USER_INTERFACE_INTERFACE_INFO) AMS_TIPC_DEFINE_INTERFACE(ams::_test::impl, IUserInterface, AMS_TEST_I_USER_INTERFACE_INTERFACE_INFO)
#define AMS_TEST_I_MANAGER_INTERFACE_INTERFACE_INFO(C, H) \
AMS_TIPC_METHOD_INFO(C, H, 0, Result, RegisterProcess, (os::ProcessId process_id, const tipc::InBuffer acid_sac, const tipc::InBuffer aci_sac), (process_id, acid_sac, aci_sac)) \
AMS_TIPC_METHOD_INFO(C, H, 1, Result, UnregisterProcess, (os::ProcessId process_id), (process_id))
AMS_TIPC_DEFINE_INTERFACE(ams::_test::impl, IManagerInterface, AMS_TEST_I_MANAGER_INTERFACE_INTERFACE_INFO)
namespace ams::_test { namespace ams::_test {
@ -33,26 +39,17 @@ namespace ams::_test {
Result GetServiceHandle(tipc::OutMoveHandle out_h, sm::ServiceName service); Result GetServiceHandle(tipc::OutMoveHandle out_h, sm::ServiceName service);
Result RegisterService(tipc::OutMoveHandle out_h, sm::ServiceName service, u32 max_sessions, bool is_light); Result RegisterService(tipc::OutMoveHandle out_h, sm::ServiceName service, u32 max_sessions, bool is_light);
Result UnregisterService(sm::ServiceName service); Result UnregisterService(sm::ServiceName service);
Result ProcessDefaultServiceCommand(const svc::ipc::MessageBuffer &message_buffer);
}; };
static_assert(impl::IsIUserInterface<UserInterfaceFacade>); static_assert(impl::IsIUserInterface<UserInterfaceFacade>);
class ManagerInterfaceFacade {
Result TestManualDispatch(UserInterfaceFacade *facade) { public:
svc::ipc::MessageBuffer message_buffer(svc::ipc::GetMessageBuffer()); Result RegisterProcess(os::ProcessId process_id, const tipc::InBuffer acid_sac, const tipc::InBuffer aci_sac);
Result UnregisterProcess(os::ProcessId process_id);
switch (svc::ipc::MessageBuffer::MessageHeader(message_buffer).GetTag()) { };
case 16: static_assert(impl::IsIManagerInterface<ManagerInterfaceFacade>);
return tipc::impl::InvokeServiceCommandImpl<16, &UserInterfaceFacade::RegisterClient, UserInterfaceFacade>(facade, message_buffer);
case 17:
return tipc::impl::InvokeServiceCommandImpl<17, &UserInterfaceFacade::GetServiceHandle, UserInterfaceFacade>(facade, message_buffer);
case 18:
return tipc::impl::InvokeServiceCommandImpl<18, &UserInterfaceFacade::RegisterService, UserInterfaceFacade>(facade, message_buffer);
case 19:
return tipc::impl::InvokeServiceCommandImpl<19, &UserInterfaceFacade::UnregisterService, UserInterfaceFacade>(facade, message_buffer);
default:
return tipc::ResultInvalidMethod();
}
}
using UserInterfaceObject = ::ams::tipc::ServiceObject<impl::IUserInterface, UserInterfaceFacade>; using UserInterfaceObject = ::ams::tipc::ServiceObject<impl::IUserInterface, UserInterfaceFacade>;
@ -60,5 +57,11 @@ namespace ams::_test {
return object->ProcessRequest(); return object->ProcessRequest();
} }
using ManagerInterfaceObject = ::ams::tipc::ServiceObject<impl::IManagerInterface, ManagerInterfaceFacade>;
Result TestManagerDispatch(ManagerInterfaceObject *object) {
return object->ProcessRequest();
}
} }