aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-06-24 13:53:15 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-06-24 13:53:15 -0400
commit57bf74407bd501b0599568a3112fc16395b575d9 (patch)
tree6619c33b02bc5f5d80ca1b1a7a2ef506e03c0852
parent075163bbb0f51174359947e1bce84f5edb23f21e (diff)
parent3f6fa3d489e127ca5a5b298eabac3ff5dbe0e112 (diff)
downloadlinux-linaro-stable-57bf74407bd501b0599568a3112fc16395b575d9.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/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 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);