summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-06-26 12:01:42 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-06-26 12:01:42 -0400
commit729d8d182bbf296b32cb2e7f970801eb6ce33c6a (patch)
tree9c44494da905a87373c1a1e16a1eb7db8d119cee /net/bluetooth
parent9fbdc75116f7a2b183464d42f3abccb616584105 (diff)
parent57bf74407bd501b0599568a3112fc16395b575d9 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 9af3a76844f7..8c3499bec893 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4334,7 +4334,7 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn,
struct l2cap_info_rsp *rsp = (struct l2cap_info_rsp *) data;
u16 type, result;
- if (cmd_len != sizeof(*rsp))
+ if (cmd_len < sizeof(*rsp))
return -EPROTO;
type = __le16_to_cpu(rsp->type);