---

yaml --- r: 377393 b: refs/heads/master c: 300b962 h: refs/heads/master i: 377391: 074095e v: v3
git-mirror · Jun 13, 2013 · fbeff95 · fbeff95
1 parent 9a6bf0f
commit fbeff95
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d90b9e29ec5fe7a08eb7965386ebb47615306584
+refs/heads/master: 300b962e5244a1ea010df7e88595faa0085b461d
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
@@ -2852,6 +2852,9 @@ static struct sk_buff *l2cap_build_cmd(struct l2cap_conn *conn, u8 code,
 	BT_DBG("conn %p, code 0x%2.2x, ident 0x%2.2x, len %u",
 	       conn, code, ident, dlen);
 
+	if (conn->mtu < L2CAP_HDR_SIZE + L2CAP_CMD_HDR_SIZE)
+		return NULL;
+
 	len = L2CAP_HDR_SIZE + L2CAP_CMD_HDR_SIZE + dlen;
 	count = min_t(unsigned int, conn->mtu, len);