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

Commit bc1b1f8b authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Marcel Holtmann
Browse files

Bluetooth: Only check SAR bits if frame is an I-frame 



The SAR bits doesn't make sense for an S-frame. It doesn't use SAR.

Checking SAR for a S-frames can lead to L2CAP errors, it could close
the channel with an invalid packet length, since we was removing the 2
of the of any frame that match SAR start bits, without check if it is
an I-frame.

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 8ff50ec0

net/bluetooth/l2cap.c

+1 −1
Original line number Diff line number Diff line
@@ -4117,7 +4117,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk 
		skb_pull(skb, 2);

		len = skb->len;



		if (__is_sar_start(control))

		if (__is_sar_start(control) && __is_iframe(control))

			len -= 2;



		if (pi->fcs == L2CAP_FCS_CRC16)