aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2010-05-11 21:14:00 -0400
committerMarcel Holtmann <marcel@holtmann.org>2010-07-21 13:39:04 -0400
commitbc1b1f8bee63966649dd5ac7d10d31a6556bf19b (patch)
tree5560ff18797eefa7db245f64acaa813091504dcc /net
parent8ff50ec04a7ecdbba6e0a5423cf6f2c5f7fc605e (diff)
Bluetooth: Only check SAR bits if frame is an I-frame
The SAR bits doesn't make sense for an S-frame. It doesn't use SAR. Checking SAR for a S-frames can lead to L2CAP errors, it could close the channel with an invalid packet length, since we was removing the 2 of the of any frame that match SAR start bits, without check if it is an I-frame. Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index a9fdfe401f5b..108c2f290ac5 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -4117,7 +4117,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
4117 skb_pull(skb, 2); 4117 skb_pull(skb, 2);
4118 len = skb->len; 4118 len = skb->len;
4119 4119
4120 if (__is_sar_start(control)) 4120 if (__is_sar_start(control) && __is_iframe(control))
4121 len -= 2; 4121 len -= 2;
4122 4122
4123 if (pi->fcs == L2CAP_FCS_CRC16) 4123 if (pi->fcs == L2CAP_FCS_CRC16)