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

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

Bluetooth: Fix SDU reassembly under SREJ 



The code was reusing the control var without its reinitialization.

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: default avatarJoão Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 0041ecfa

net/bluetooth/l2cap.c

+2 −2
Original line number Diff line number Diff line
@@ -3446,14 +3446,14 @@ static int l2cap_sar_reassembly_sdu(struct sock *sk, struct sk_buff *skb, u16 co 
static void l2cap_check_srej_gap(struct sock *sk, u8 tx_seq)

{

	struct sk_buff *skb;

	u16 control = 0;

	u16 control;



	while((skb = skb_peek(SREJ_QUEUE(sk)))) {

		if (bt_cb(skb)->tx_seq != tx_seq)

			break;



		skb = skb_dequeue(SREJ_QUEUE(sk));

		control |= bt_cb(skb)->sar << L2CAP_CTRL_SAR_SHIFT;

		control = bt_cb(skb)->sar << L2CAP_CTRL_SAR_SHIFT;

		l2cap_sar_reassembly_sdu(sk, skb, control);

		l2cap_pi(sk)->buffer_seq_srej =

			(l2cap_pi(sk)->buffer_seq_srej + 1) % 64;