From d5fb0c6849078eacd467e75a346b631fea193ea0 Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Mon, 7 Jun 2010 19:21:30 -0300
Subject: [PATCH] --- yaml --- r: 203843 b: refs/heads/master c:
 45d65c46acc39945219eeb3752367ee80ed82799 h: refs/heads/master i:   203841:
 a5631280742692eff11b0c5d4bc5e84e34bbcbc6   203839:
 43b93b5d37daeffbb5290d9e786c30cfc757fe54 v: v3

---
 [refs]                      | 2 +-
 trunk/net/bluetooth/l2cap.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cd92c54ebcec..ac60eaf843c3 100644
--- 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
index f0441b0b0335..6094870d5d2a 100644
--- 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: