Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac9eac76 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: pd: Avoid buffer overrun during msg_rx" into msm-4.8

parents 79db4e10 d534bcf0
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static void phy_msg_received(struct usbpd *pd, enum pd_msg_type type,

	rx_msg->type = PD_MSG_HDR_TYPE(header);
	rx_msg->len = PD_MSG_HDR_COUNT(header);
	memcpy(&rx_msg->payload, buf, len);
	memcpy(&rx_msg->payload, buf, min(len, sizeof(rx_msg->payload)));

	spin_lock_irqsave(&pd->rx_lock, flags);
	list_add_tail(&rx_msg->entry, &pd->rx_q);