diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-06-26 12:01:42 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-06-26 12:01:42 -0400 |
commit | 729d8d182bbf296b32cb2e7f970801eb6ce33c6a (patch) | |
tree | 9c44494da905a87373c1a1e16a1eb7db8d119cee /net | |
parent | 9fbdc75116f7a2b183464d42f3abccb616584105 (diff) | |
parent | 57bf74407bd501b0599568a3112fc16395b575d9 (diff) | |
download | op-kernel-dev-729d8d182bbf296b32cb2e7f970801eb6ce33c6a.zip op-kernel-dev-729d8d182bbf296b32cb2e7f970801eb6ce33c6a.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/l2cap_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 9af3a76..8c3499be 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); |