From: "Gustavo F. Padovan" <gustavo@padovan.org>
To: linux-bluetooth@vger.kernel.org
Cc: gustavo@padovan.org, marcel@holtmann.org,
"Gustavo F. Padovan" <padovan@profusion.mobi>
Subject: [PATCH 07/14] Bluetooth: Only check SAR bits if frame is I-frame
Date: Sat, 5 Jun 2010 04:50:11 -0300 [thread overview]
Message-ID: <1275724218-29453-8-git-send-email-gustavo@padovan.org> (raw)
In-Reply-To: <1275724218-29453-7-git-send-email-gustavo@padovan.org>
From: Gustavo F. Padovan <padovan@profusion.mobi>
Check the SAR bit only make sense for an I-frame. Also check SAR for
S-frame lead to errors.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
---
net/bluetooth/l2cap.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 97584d8..7a8454a 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -4122,7 +4122,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
if (l2cap_check_fcs(pi, skb))
goto drop;
- if (__is_sar_start(control))
+ if (__is_sar_start(control) && __is_iframe(control))
len -= 2;
if (pi->fcs == L2CAP_FCS_CRC16)
--
1.7.1
next prev parent reply other threads:[~2010-06-05 7:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-05 7:50 Pull request: Fixes for the Enhanced Retransmission Mode Gustavo F. Padovan
2010-06-05 7:50 ` [PATCH 01/14] Bluetooth: Remove max_tx and tx_window modules paramenter from L2CAP Gustavo F. Padovan
2010-06-05 7:50 ` [PATCH 02/14] Bluetooth: Remove L2CAP Extended Features from Kconfig Gustavo F. Padovan
2010-06-05 7:50 ` [PATCH 03/14] Bluetooth: Fix drop of packets with invalid req_seq/tx_seq Gustavo F. Padovan
2010-06-05 7:50 ` [PATCH 04/14] Bluetooth: Check skb_clone return to avoid NULL dereference Gustavo F. Padovan
2010-06-05 7:50 ` [PATCH 05/14] Bluetooth: Fix ERTM vars increment Gustavo F. Padovan
2010-06-05 7:50 ` [PATCH 06/14] Bluetooth: Check packet FCS earlier Gustavo F. Padovan
2010-06-05 7:50 ` Gustavo F. Padovan [this message]
2010-06-05 7:50 ` [PATCH 08/14] Bluetooth: Stop ack_timer if ERTM enters in Local Busy or SREJ_SENT Gustavo F. Padovan
2010-06-05 7:50 ` [PATCH 09/14] Bluetooth: Fix ERTM channel shutdown Gustavo F. Padovan
2010-06-05 7:50 ` [PATCH 10/14] Bluetooth: Fix crash when sending frames after connection is closed Gustavo F. Padovan
2010-06-05 7:50 ` [PATCH 11/14] Bluetooth: Fix handle of received P-bit Gustavo F. Padovan
2010-06-05 7:50 ` [PATCH 12/14] Bluetooth: Fix l2cap_ertm_send() behavior Gustavo F. Padovan
2010-06-05 7:50 ` [PATCH 13/14] Bluetooth: Fix SREJ_QUEUE corruption Gustavo F. Padovan
2010-06-05 7:50 ` [PATCH 14/14] Bluetooth: Fix missing retransmission action with RR(P=1) Gustavo F. Padovan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1275724218-29453-8-git-send-email-gustavo@padovan.org \
--to=gustavo@padovan.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=padovan@profusion.mobi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).