---

yaml --- r: 188885 b: refs/heads/master c: c2c77ec h: refs/heads/master i: 188883: 64a0038 v: v3
git-mirror · Mar 21, 2010 · 17421e4 · 17421e4
1 parent 0c4aa61
commit 17421e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aef7d97cc604309b66f6f45cce02cd734934cd4e
+refs/heads/master: c2c77ec83bdad17fb688557b5b3fdc36661dd1c6
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
@@ -2832,6 +2832,11 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr
 			int len = cmd->len - sizeof(*rsp);
 			char req[64];
 
+			if (len > sizeof(req) - sizeof(struct l2cap_conf_req)) {
+				l2cap_send_disconn_req(conn, sk);
+				goto done;
+			}
+
 			/* throw out any old stored conf requests */
 			result = L2CAP_CONF_SUCCESS;
 			len = l2cap_parse_conf_rsp(sk, rsp->data,