Patchwork [3.18,12/50] Bluetooth: bnep: bnep_add_connection() should verify that its dealing with l2cap socket

login
register
mail settings
Submitter gregkh@linuxfoundation.org
Date Aug. 4, 2017, 11:15 p.m.
Message ID <20170804231551.536305789@linuxfoundation.org>
Download mbox | patch
Permalink /patch/9882449/
State New
Headers show

Comments

gregkh@linuxfoundation.org - Aug. 4, 2017, 11:15 p.m.
3.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Al Viro <viro@zeniv.linux.org.uk>

commit 71bb99a02b32b4cc4265118e85f6035ca72923f0 upstream.

same story as cmtp

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 net/bluetooth/bnep/core.c |    3 +++
 1 file changed, 3 insertions(+)

Patch

--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -533,6 +533,9 @@  int bnep_add_connection(struct bnep_conn
 
 	BT_DBG("");
 
+	if (!l2cap_is_socket(sock))
+		return -EBADFD;
+
 	baswap((void *) dst, &l2cap_pi(sock->sk)->chan->dst);
 	baswap((void *) src, &l2cap_pi(sock->sk)->chan->src);