summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-06-25 13:24:12 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-06-25 13:24:12 -0400
commit9d5c34f568a8d80cb69cc89ebb426ceb1d1f4737 (patch)
tree41ff0839bb0fe650797b9681e138f1c2408e1208 /net
parentf57da7a65b386dd4535daa4f7a3773a025fbb022 (diff)
parent57bf74407bd501b0599568a3112fc16395b575d9 (diff)
downloadlinux-9d5c34f568a8d80cb69cc89ebb426ceb1d1f4737.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net')
-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 4be6a264b475..68843a28a7af 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4333,7 +4333,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);