---

yaml --- r: 215250 b: refs/heads/master c: aae7fe2 h: refs/heads/master v: v3
git-mirror · Oct 12, 2010 · 3035cb6 · 3035cb6
1 parent 70fe8ef
commit 3035cb6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8979481328dc2e14cea9f99b3562ffcf8655998e
+refs/heads/master: aae7fe22a875a84e328469e228cba033ebbf20cb
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
@@ -4675,7 +4675,8 @@ static int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 fl
 			l2cap_conn_unreliable(conn, ECOMM);
 		}
 
-		if (skb->len < 2) {
+		/* Start fragment always begin with Basic L2CAP header */
+		if (skb->len < L2CAP_HDR_SIZE) {
 			BT_ERR("Frame is too short (len %d)", skb->len);
 			l2cap_conn_unreliable(conn, ECOMM);
 			goto drop;