Bluetooth: L2CAP: copy RX timestamp to new fragments

pv · gregkh · commit 432572d53602 · 2025-05-09T09:50:40.000+02:00
[ Upstream commit 3908feb ] Copy timestamp too when allocating new skb for received fragment. Fixes missing RX timestamps with fragmentation. Fixes: 4d7ea8e ("Bluetooth: L2CAP: Fix handling fragmented length") Signed-off-by: Pauli Virtanen <pav@iki.fi> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
@@ -7380,6 +7380,9 @@ static int l2cap_recv_frag(struct l2cap_conn *conn, struct sk_buff *skb,
 			return -ENOMEM;
 		/* Init rx_len */
 		conn->rx_len = len;
+
+		skb_set_delivery_time(conn->rx_skb, skb->tstamp,
+				      skb->tstamp_type);
 	}
 
 	/* Copy as much as the rx_skb can hold */

Original file line number	Diff line number	Diff line change
`@@ -7380,6 +7380,9 @@ static int l2cap_recv_frag(struct l2cap_conn conn, struct sk_buff skb,`
`7380`	`7380`	`return -ENOMEM;`
`7381`	`7381`	`/* Init rx_len */`
`7382`	`7382`	`conn->rx_len = len;`
	`7383`	`+`
	`7384`	`+ skb_set_delivery_time(conn->rx_skb, skb->tstamp,`
	`7385`	`+ skb->tstamp_type);`
`7383`	`7386`	`}`
`7384`	`7387`
`7385`	`7388`	`/* Copy as much as the rx_skb can hold */`