Skip to content

staging: vc04_services: vchiq-mmal: harden MMAL message handling against firmware bugs #7296

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
Sebasteuo wants to merge 4 commits into
base: rpi-6.18.y
Choose a base branch
from
+38 −5
Open

staging: vc04_services: vchiq-mmal: harden MMAL message handling against firmware bugs #7296

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09cfb46
staging: vc04_services: vchiq-mmal: validate component index in event…
Sebasteuo Mar 29, 2026
d70dd9f
staging: vc04_services: vchiq-mmal: add buffer size check in inline_r…
Sebasteuo Mar 29, 2026
2fcaebe
staging: vc04_services: vchiq-mmal: prevent stack overflow in port_pa…
Sebasteuo Mar 29, 2026
1806494
staging: vc04_services: vchiq-mmal: fix integer underflow in port_par…
Sebasteuo Mar 29, 2026
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
43 changes: 38 additions & 5 deletions drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,12 +369,26 @@ static int inline_receive(struct vchiq_mmal_instance *instance,
struct mmal_msg *msg,
struct mmal_msg_context *msg_context)
{
u32 payload_len = msg->u.buffer_from_host.payload_in_message;

/*
* Ensure the payload fits within the destination buffer.
* The caller already validates payload_len <= MMAL_VC_SHORT_DATA
* against the source, but the destination buffer may be smaller.
* bulk_receive() performs this check; inline_receive() must too.
*/
if (payload_len > msg_context->u.bulk.buffer->buffer_size) {
payload_len = msg_context->u.bulk.buffer->buffer_size;
pr_warn_ratelimited("inline_receive: payload truncated (%u > %lu)\n",
msg->u.buffer_from_host.payload_in_message,
msg_context->u.bulk.buffer->buffer_size);
}

memcpy(msg_context->u.bulk.buffer->buffer,
msg->u.buffer_from_host.short_data,
msg->u.buffer_from_host.payload_in_message);
payload_len);

msg_context->u.bulk.buffer_used =
msg->u.buffer_from_host.payload_in_message;
msg_context->u.bulk.buffer_used = payload_len;

return 0;
}
Expand Down Expand Up @@ -478,12 +492,19 @@ static void event_to_host_cb(struct vchiq_mmal_instance *instance,
struct mmal_msg *msg, u32 msg_len)
{
int comp_idx = msg->u.event_to_host.client_component;
struct vchiq_mmal_component *component =
&instance->component[comp_idx];
struct vchiq_mmal_component *component;
struct vchiq_mmal_port *port = NULL;
struct mmal_msg_context *msg_context;
u32 port_num = msg->u.event_to_host.port_num;

if (comp_idx < 0 || comp_idx >= VCHIQ_MMAL_MAX_COMPONENTS) {
pr_err_ratelimited("%s: component index %d out of range\n",
__func__, comp_idx);
return;
}

component = &instance->component[comp_idx];

if (msg->u.buffer_from_host.drvbuf.magic == MMAL_MAGIC) {
pr_err("%s: MMAL_MSG_TYPE_BUFFER_TO_HOST with bad magic\n",
__func__);
Expand Down Expand Up @@ -1342,6 +1363,14 @@ static int port_parameter_set(struct vchiq_mmal_instance *instance,
struct mmal_msg *rmsg;
struct vchiq_header *rmsg_handle;

if (value_size >
sizeof(m.u.port_parameter_set.value)) {
pr_err_ratelimited("port_parameter_set: value_size %u exceeds max %zu\n",
value_size,
sizeof(m.u.port_parameter_set.value));
return -EINVAL;
}

m.h.type = MMAL_MSG_TYPE_PORT_PARAMETER_SET;

m.u.port_parameter_set.component_handle = port->component->handle;
Expand Down Expand Up @@ -1409,6 +1438,10 @@ static int port_parameter_get(struct vchiq_mmal_instance *instance,
/* port_parameter_get_reply.size includes the header,
* whilst *value_size doesn't.
*/
if (rmsg->u.port_parameter_get_reply.size < (2 * sizeof(u32))) {
ret = -EPROTO;
goto release_msg;
}
rmsg->u.port_parameter_get_reply.size -= (2 * sizeof(u32));

if (ret || rmsg->u.port_parameter_get_reply.size > *value_size) {
Expand Down