summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJaganath Kanakkassery <jaganath.k@samsung.com>2013-06-21 18:25:11 +0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-06-23 03:24:58 +0400
commit3f6fa3d489e127ca5a5b298eabac3ff5dbe0e112 (patch)
tree1a91f5399d9638bc2ce6a668bec576057121f406 /net
parentfcb3701849957917a234a61b58ad70ed35c83eda (diff)
downloadlinux-3f6fa3d489e127ca5a5b298eabac3ff5dbe0e112.tar.xz
Bluetooth: Fix invalid length check in l2cap_information_rsp()
The length check is invalid since the length varies with type of info response. This was introduced by the commit cb3b3152b2f5939d67005cff841a1ca748b19888 Because of this, l2cap info rsp is not handled and command reject is sent. > ACL data: handle 11 flags 0x02 dlen 16 L2CAP(s): Info rsp: type 2 result 0 Extended feature mask 0x00b8 Enhanced Retransmission mode Streaming mode FCS Option Fixed Channels < ACL data: handle 11 flags 0x00 dlen 10 L2CAP(s): Command rej: reason 0 Command not understood Cc: stable@vger.kernel.org Signed-off-by: Jaganath Kanakkassery <jaganath.k@samsung.com> Signed-off-by: Chan-Yeol Park <chanyeol.park@samsung.com> Acked-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
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);