Skip to content

Fix memory corruption (too small IPC::Message::messageData) #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dwrobel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix memory corruption (too small IPC::Message::messageData) #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/util/ipc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
namespace IPC {

struct Message {
static const size_t size = 32;
static const size_t dataSize = 24;
static constexpr size_t size = 40;
static constexpr size_t dataSize = 32;

uint64_t messageCode { 0 };
uint8_t messageData[dataSize] { 0, };
Expand Down
4 changes: 2 additions & 2 deletions src/wayland-egl/ipc-waylandegl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace IPC {
namespace WaylandEGL {

struct BufferCommit {
uint8_t padding[24];
uint8_t padding[sizeof(Message::messageData)];

static const uint64_t code = 1;
static void construct(Message& message)
Expand All @@ -52,7 +52,7 @@ struct BufferCommit {
static_assert(sizeof(BufferCommit) == Message::dataSize, "BufferCommit is of correct size");

struct FrameComplete {
int8_t padding[24];
int8_t padding[sizeof(Message::messageData)];

static const uint64_t code = 2;
static void construct(Message& message)
Expand Down
1 change: 1 addition & 0 deletions src/wayland/display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,7 @@ void EventDispatcher::sendEvent( wpe_input_axis_event& event )
{
IPC::Message message;
message.messageCode = MsgType::AXIS;
static_assert(sizeof(event) <= sizeof(message.messageData), "Message::messageData is of correct size");
memcpy( message.messageData, &event, sizeof(event) );
m_ipc->sendMessage(IPC::Message::data(message), IPC::Message::size);
}
Expand Down