Skip to contentSkip to conversation

gpio: ljca: validate event payload length

PATCH In review David Lee 2 participants 2 messages Jul 20

Subsystems (2)
lore
Share & tools
lore

David Lee

author
#0 lore raw

PATCH 1/1 gpio: ljca: validate event payload length

ljca_gpio_event_cb() ignores the event length and trusts packet->num as the number of two-byte GPIO records. A device can provide a complete USB message whose nested count extends beyond the payload, making the callback read beyond the receive allocation.

Require the payload to contain both the count byte and every record it declares before iterating over the flexible array.

Fixes c5a4b6fd31e8 ("gpio: Add support for Intel LJCA USB GPIO driver")
Assisted-by Codex:gpt-5.5
---
 drivers/gpio/gpio-ljca.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpio/gpio-ljca.c +3 -0
index f32d1d237795..cb2b2623ccb1 100644
@@ -290,6 +290,9 @@ static void ljca_gpio_event_cb(void *context, u8 cmd, const void *evt_data,
 
 	if (cmd != LJCA_GPIO_INT_EVENT)
 		return;
+	if (len < sizeof(*packet) ||
+	    struct_size(packet, item, packet->num) > len)
+		return;
 
 	for (i = 0; i < packet->num; i++) {
 		generic_handle_domain_irq(ljca_gpio->gc.irq.domain,
Signature · 1 line
2.43.0
maintainer
#1 lore raw

Hi David,

Thanks for the patch.

Quoted 20 lines · David Lee

ljca_gpio_event_cb() ignores the event length and trusts packet->num as the number of two-byte GPIO records. A device can provide a complete USB message whose nested count extends beyond the payload, making the callback read beyond the receive allocation.

Require the payload to contain both the count byte and every record it declares before iterating over the flexible array.

Fixes c5a4b6fd31e8 ("gpio: Add support for Intel LJCA USB GPIO driver")
Assisted-by Codex:gpt-5.5
---
 drivers/gpio/gpio-ljca.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpio/gpio-ljca.c +0 -0
index f32d1d237795..cb2b2623ccb1 100644

drivers/gpio/gpio-ljca.c static void ljca_gpio_event_cb(void *context, u8 cmd, const void *evt_data, · line 295

Quoted 6 lines
drivers/gpio/gpio-ljca.c +3 -0
@@ -290,6 +290,9 @@ static void ljca_gpio_event_cb(void *context, u8 cmd, const void *evt_data,
 
 	if (cmd != LJCA_GPIO_INT_EVENT)
 		return;
+	if (len < sizeof(*packet) ||
+	    struct_size(packet, item, packet->num) > len)
+		return;

I think this case would require a warning message, maybe using dev_warn_once().

Quoted 3 lines
drivers/gpio/gpio-ljca.c +0 -0
 	for (i = 0; i < packet->num; i++) {
 		generic_handle_domain_irq(ljca_gpio->gc.irq.domain,
Signature · 3 lines
Regards,

Sakari Ailus