---

yaml --- r: 203843 b: refs/heads/master c: 45d65c4 h: refs/heads/master i: 203841: a563128 203839: 43b93b5 v: v3
git-mirror · Jul 21, 2010 · d5fb0c6 · d5fb0c6
1 parent 4ecced6
commit d5fb0c6
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: 3cb123d1c03a0510d3c325bfaa971ce4df1e050d
+refs/heads/master: 45d65c46acc39945219eeb3752367ee80ed82799
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
@@ -1912,6 +1912,11 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __us
 			break;
 		}
 
+		if (opts.txwin_size > L2CAP_DEFAULT_TX_WINDOW) {
+			err = -EINVAL;
+			break;
+		}
+
 		l2cap_pi(sk)->mode = opts.mode;
 		switch (l2cap_pi(sk)->mode) {
 		case L2CAP_MODE_BASIC: