diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-24 19:53:15 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-24 19:53:15 +0200 |
| commit | 57bf74407bd501b0599568a3112fc16395b575d9 (patch) | |
| tree | 6619c33b02bc5f5d80ca1b1a7a2ef506e03c0852 /net | |
| parent | ath9k_htc: Handle IDLE state transition properly (diff) | |
| parent | Bluetooth: Fix invalid length check in l2cap_information_rsp() (diff) | |
| download | linux-57bf74407bd501b0599568a3112fc16395b575d9.tar.xz linux-57bf74407bd501b0599568a3112fc16395b575d9.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
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, 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); |