gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-07-30 23:50:24 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10642

Browse Source 
98b350f contrib: fix unaligned&aliased levin buffer reads (jeffro256)
This commit is contained in:
tobtoht
2026-05-27 00:46:24 +00:00
parent cb1b4b5321 98b350f7a1
commit 612d207f51
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/epee/include/net/levin_protocol_handler_async.h
+15 -13
View File
@@ -576,32 +576,34 @@ public:
{ {
if(m_cache_in_buffer.size() < sizeof(bucket_head2)) if(m_cache_in_buffer.size() < sizeof(bucket_head2))
{ {
if(m_cache_in_buffer.size() >= sizeof(uint64_t) && *((uint64_t*)m_cache_in_buffer.span(8).data()) != SWAP64LE(LEVIN_SIGNATURE)) if(m_cache_in_buffer.size() >= sizeof(uint64_t))
{
std::uint64_t levin_sig;
memcpy(&levin_sig, m_cache_in_buffer.span(sizeof(std::uint64_t)).data(), sizeof(std::uint64_t));
if (SWAP64LE(LEVIN_SIGNATURE) != levin_sig)
{ {
MWARNING(m_connection_context << "Signature mismatch, connection will be closed"); MWARNING(m_connection_context << "Signature mismatch, connection will be closed");
return false; return false;
} }
}
is_continue = false; is_continue = false;
break; break;
} }
#if BYTE_ORDER == LITTLE_ENDIAN memcpy(&m_current_head, m_cache_in_buffer.span(sizeof(bucket_head2)).data(), sizeof(bucket_head2));
bucket_head2& phead = *(bucket_head2*)m_cache_in_buffer.span(sizeof(bucket_head2)).data(); #if BYTE_ORDER != LITTLE_ENDIAN
#else m_current_head.m_signature = SWAP64LE(m_current_head.m_signature);
bucket_head2 phead = *(bucket_head2*)m_cache_in_buffer.span(sizeof(bucket_head2)).data(); m_current_head.m_cb = SWAP64LE(m_current_head.m_cb);
phead.m_signature = SWAP64LE(phead.m_signature); m_current_head.m_command = SWAP32LE(m_current_head.m_command);
phead.m_cb = SWAP64LE(phead.m_cb); m_current_head.m_return_code = SWAP32LE(m_current_head.m_return_code);
phead.m_command = SWAP32LE(phead.m_command); m_current_head.m_flags = SWAP32LE(m_current_head.m_flags);
phead.m_return_code = SWAP32LE(phead.m_return_code); m_current_head.m_protocol_version = SWAP32LE(m_current_head.m_protocol_version);
phead.m_flags = SWAP32LE(phead.m_flags);
phead.m_protocol_version = SWAP32LE(phead.m_protocol_version);
#endif #endif
if(LEVIN_SIGNATURE != phead.m_signature) if(LEVIN_SIGNATURE != m_current_head.m_signature)
{ {
LOG_ERROR_CC(m_connection_context, "Signature mismatch, connection will be closed"); LOG_ERROR_CC(m_connection_context, "Signature mismatch, connection will be closed");
return false; return false;
} }
m_current_head = phead;
m_cache_in_buffer.erase(sizeof(bucket_head2)); m_cache_in_buffer.erase(sizeof(bucket_head2));
m_state = stream_state_body; m_state = stream_state_body;