diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-25 13:24:12 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-25 13:24:12 -0400 |
| commit | 9d5c34f568a8d80cb69cc89ebb426ceb1d1f4737 (patch) | |
| tree | 41ff0839bb0fe650797b9681e138f1c2408e1208 /net | |
| parent | f57da7a65b386dd4535daa4f7a3773a025fbb022 (diff) | |
| parent | 57bf74407bd501b0599568a3112fc16395b575d9 (diff) | |
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.c | 2 |
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, | |||
| 4333 | struct l2cap_info_rsp *rsp = (struct l2cap_info_rsp *) data; | 4333 | struct l2cap_info_rsp *rsp = (struct l2cap_info_rsp *) data; |
| 4334 | u16 type, result; | 4334 | u16 type, result; |
| 4335 | 4335 | ||
| 4336 | if (cmd_len != sizeof(*rsp)) | 4336 | if (cmd_len < sizeof(*rsp)) |
| 4337 | return -EPROTO; | 4337 | return -EPROTO; |
| 4338 | 4338 | ||
| 4339 | type = __le16_to_cpu(rsp->type); | 4339 | type = __le16_to_cpu(rsp->type); |