[Linux-stable-mirror] [PATCH 3.2 86/94] Bluetooth: bnep: bnep_add_connection() should verify that it's dealing with l2cap socket

3.2.97-rc1 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 [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings ben@decadent.org.uk --- net/bluetooth/bnep/core.c | 3 +++ 1 file changed, 3 insertions(+)

--- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c @@ -560,6 +560,9 @@ int bnep_add_connection(struct bnep_conn

BT_DBG("");

+ if (!l2cap_is_socket(sock)) + return -EBADFD; + baswap((void *) dst, &bt_sk(sock->sk)->dst); baswap((void *) src, &bt_sk(sock->sk)->src);