Skip to contentSkip to conversation

Bluetooth: remove ERTM minimum packet length

PATCH In review Nathan Holstein 2 participants 2 messages Jun 9, 2010

Subsystems (2)
Bluetooth drivers Bluetooth
lore
Share & tools
lore

Nathan Holstein

author
#0 lore raw

PATCH 1/1 Bluetooth: remove ERTM minimum packet length

ERTM and streaming mode L2CAP sockets have no minimum packet length. Instead, validate the the packet contained all necessary control, FCS, and SAR fields.

Signed-off-by Nathan Holstein <[email protected]>
---
 net/bluetooth/l2cap.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
net/bluetooth/l2cap.c +4 -4
index 411b1ec..9099e6d 100644
@@ -4131,9 +4131,9 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
 {
 	struct sock *sk;
 	struct l2cap_pinfo *pi;
-	u16 control, len;
+	u16 control;
 	u8 tx_seq, req_seq;
-	int next_tx_seq_offset, req_seq_offset;
+	int len, next_tx_seq_offset, req_seq_offset;
 
 	sk = l2cap_get_chan_by_scid(&conn->chan_list, cid);
 	if (!sk) {

@@ -4203,7 +4203,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
 		}
 
 		if (__is_iframe(control)) {
-			if (len < 4) {
+			if (len < 0) {
 				l2cap_send_disconn_req(pi->conn, sk);
 				goto drop;
 			}

@@ -4234,7 +4234,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
 		if (pi->fcs == L2CAP_FCS_CRC16)
 			len -= 2;
 
-		if (len > pi->mps || len < 4 || __is_sframe(control))
+		if (len > pi->mps || len < 0 || __is_sframe(control))
 			goto drop;
 
 		tx_seq = __get_txseq(control);
Signature · 1 line
1.6.0.4
#1 lore raw

Hi Nathan,

Quoted 9 lines · Nathan Holstein

ERTM and streaming mode L2CAP sockets have no minimum packet length. Instead, validate the the packet contained all necessary control, FCS, and SAR fields.

Signed-off-by Nathan Holstein <[email protected]>
---
 net/bluetooth/l2cap.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Patch has been applied to the master branch of my tree. Thanks.

Signature · 2 lines
Gustavo F. Padovan
http://padovan.org