From: johan.hedberg@gmail.com
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v4 4/8] Bluetooth: Fix L2CAP Disconnect response for unknown CID
Date: Sun, 15 Sep 2013 21:16:37 +0300 [thread overview]
Message-ID: <1379269001-6313-5-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1379269001-6313-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
If we receive an L2CAP Disconnect Request for an unknown CID we should
not just silently drop it but reply with a proper Command Reject
response. This patch fixes this by ensuring that the disconnect handler
returns a proper error instead of 0 and will cause the function caller
to send the right response.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/l2cap_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 8c718dd..0b1a656 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4206,7 +4206,7 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn,
chan = __l2cap_get_chan_by_scid(conn, dcid);
if (!chan) {
mutex_unlock(&conn->chan_lock);
- return 0;
+ return -ENOENT;
}
l2cap_chan_lock(chan);
--
1.8.4.rc3
next prev parent reply other threads:[~2013-09-15 18:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-15 18:16 [PATCH v4 0/8] Bluetooth: Various L2CAP fixes johan.hedberg
2013-09-15 18:16 ` [PATCH v4 1/8] Bluetooth: Remove unused event mask struct johan.hedberg
2013-09-15 18:16 ` [PATCH v4 2/8] Bluetooth: Fix double error response for l2cap_create_chan_req johan.hedberg
2013-09-15 19:05 ` Marcel Holtmann
2013-09-15 18:16 ` [PATCH v4 3/8] Bluetooth: Fix L2CAP command reject reason johan.hedberg
2013-09-15 18:16 ` johan.hedberg [this message]
2013-09-15 18:16 ` [PATCH v4 5/8] Bluetooth: Fix L2CAP error return used for failed channel lookups johan.hedberg
2013-09-15 18:16 ` [PATCH v4 6/8] Bluetooth: Fix sending responses to identified L2CAP response packets johan.hedberg
2013-09-15 18:16 ` [PATCH v4 7/8] Bluetooth: Fix responding to invalid L2CAP signaling commands johan.hedberg
2013-09-15 18:16 ` [PATCH v4 8/8] Bluetooth: Fix waiting for clearing of BT_SK_SUSPEND flag johan.hedberg
2013-09-15 19:15 ` Marcel Holtmann
2013-09-16 8:19 ` Johan Hedberg
2013-09-16 14:14 ` Marcel Holtmann
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=1379269001-6313-5-git-send-email-johan.hedberg@gmail.com \
--to=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/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).