Skip to content
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.

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

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

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

Conversation

dwrobel
Copy link
Member

@dwrobel dwrobel commented Mar 28, 2019

Copying wpe_input_axis_event to IPC::Message::messageData
in the code like:

memcpy( message.messageData, &event, sizeof(event) );

causes memory corruption as the size of messageData is 24
while the size of wpe_input_axis_event is 28 bytes.

Dump of relevant offsets:

(gdb) ptype /o IPC::Message
/* offset | size / type = struct IPC::Message {
static const size_t size;
static const size_t dataSize;
/
0 | 8 / uint64_t messageCode;
/
8 | 24 */ uint8_t messageData[24];

                       /* total size (bytes):   32 */
                     }

(gdb) ptype /o wpe_input_axis_event
/* offset | size / type = struct wpe_input_axis_event {
/
0 | 4 / enum wpe_input_axis_event_type type;
/
4 | 4 / uint32_t time;
/
8 | 4 / int x;
/
12 | 4 / int y;
/
16 | 4 / uint32_t axis;
/
20 | 4 / int32_t value;
/
24 | 4 */ uint32_t modifiers;

                       /* total size (bytes):   28 */
                     }

Fix increases the size of messageData appropriately and adds a
static_assert() to make sure the program will not compile rather
than trying to corrupt the memory.

Copying wpe_input_axis_event to IPC::Message::messageData
in the code like:

    memcpy( message.messageData, &event, sizeof(event) );

causes memory corruption as the size of messageData is 24
while the size of wpe_input_axis_event is 28 bytes.

Dump of relevant offsets:

(gdb) ptype /o IPC::Message
/* offset    |  size */  type = struct IPC::Message {
                           static const size_t size;
                           static const size_t dataSize;
/*    0      |     8 */    uint64_t messageCode;
/*    8      |    24 */    uint8_t messageData[24];

                           /* total size (bytes):   32 */
                         }
(gdb) ptype /o wpe_input_axis_event
/* offset    |  size */  type = struct wpe_input_axis_event {
/*    0      |     4 */    enum wpe_input_axis_event_type type;
/*    4      |     4 */    uint32_t time;
/*    8      |     4 */    int x;
/*   12      |     4 */    int y;
/*   16      |     4 */    uint32_t axis;
/*   20      |     4 */    int32_t value;
/*   24      |     4 */    uint32_t modifiers;

                           /* total size (bytes):   28 */
                         }

Fix increases the size of messageData appropriately and adds a
static_assert() to make sure the program will not compile rather
than trying to corrupt the memory.
@albertd albertd requested a review from zdobersek March 29, 2019 15:19
@woutermeek
Copy link
Contributor

@dwrobel is still needed with the current master?

@dwrobel
Copy link
Member Author

dwrobel commented Dec 17, 2020

@dwrobel is still needed with the current master?

I'm sorry, I can't tell you as I'm not working on that any longer.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants