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

Commit 793c2f1c authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: EWS: rewrite check frame type function 



Check frame function uses now information about control field type.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent fb45de7d

include/net/bluetooth/l2cap.h

+16 −2
Original line number Diff line number Diff line
@@ -548,8 +548,22 @@ static inline __u32 __set_txseq(struct l2cap_chan *chan, __u32 txseq) 
		return (txseq << L2CAP_CTRL_TXSEQ_SHIFT) & L2CAP_CTRL_TXSEQ;

}



#define __is_iframe(ctrl)	(!((ctrl) & L2CAP_CTRL_FRAME_TYPE))

#define __is_sframe(ctrl)	((ctrl) & L2CAP_CTRL_FRAME_TYPE)

static inline bool __is_sframe(struct l2cap_chan *chan, __u32 ctrl)

{

	if (test_bit(FLAG_EXT_CTRL, &chan->flags))

		return ctrl & L2CAP_EXT_CTRL_FRAME_TYPE;

	else

		return ctrl & L2CAP_CTRL_FRAME_TYPE;

}



static inline __u32 __set_sframe(struct l2cap_chan *chan)

{

	if (test_bit(FLAG_EXT_CTRL, &chan->flags))

		return L2CAP_EXT_CTRL_FRAME_TYPE;

	else

		return L2CAP_CTRL_FRAME_TYPE;

}



static inline __u8 __get_ctrl_sar(struct l2cap_chan *chan, __u32 ctrl)

{

	if (test_bit(FLAG_EXT_CTRL, &chan->flags))

net/bluetooth/l2cap_core.c

+5 −4
Original line number Diff line number Diff line
@@ -578,7 +578,8 @@ static inline void l2cap_send_sframe(struct l2cap_chan *chan, u16 control) 
	BT_DBG("chan %p, control 0x%2.2x", chan, control);



	count = min_t(unsigned int, conn->mtu, hlen);

	control |= L2CAP_CTRL_FRAME_TYPE;



	control |= __set_sframe(chan);



	if (test_and_clear_bit(CONN_SEND_FBIT, &chan->conn_state))

		control |= L2CAP_CTRL_FINAL;
@@ -3707,7 +3708,7 @@ static int l2cap_ertm_data_rcv(struct sock *sk, struct sk_buff *skb) 
	if (l2cap_check_fcs(chan, skb))

		goto drop;



	if (__is_sar_start(chan, control) && __is_iframe(control))

	if (__is_sar_start(chan, control) && !__is_sframe(chan, control))

		len -= 2;



	if (chan->fcs == L2CAP_FCS_CRC16)
@@ -3734,7 +3735,7 @@ static int l2cap_ertm_data_rcv(struct sock *sk, struct sk_buff *skb) 
		goto drop;

	}



	if (__is_iframe(control)) {

	if (!__is_sframe(chan, control)) {

		if (len < 0) {

			l2cap_send_disconn_req(chan->conn, chan, ECONNRESET);

			goto drop;
@@ -3817,7 +3818,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk 
		if (chan->fcs == L2CAP_FCS_CRC16)

			len -= 2;



		if (len > chan->mps || len < 0 || __is_sframe(control))

		if (len > chan->mps || len < 0 || __is_sframe(chan, control))

			goto drop;



		tx_seq = __get_txseq(chan, control);