Bluetooth: cmtp: cmtp_add_connection() should verify that it's dealing with l2cap...
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 19 Dec 2014 06:20:58 +0000 (06:20 +0000)
committerMarcel Holtmann <marcel@holtmann.org>
Fri, 19 Dec 2014 12:48:21 +0000 (13:48 +0100)
... rather than relying on ciptool(8) never passing it anything else.  Give
it e.g. an AF_UNIX connected socket (from socketpair(2)) and it'll oops,
trying to evaluate &l2cap_pi(sock->sk)->chan->dst...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/cmtp/core.c

index 67fe5e84e68f0bffb166bbcfb6cdb736f15ab05e..278a194e6af488f67197c3725ca937f554989498 100644 (file)
@@ -334,6 +334,9 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
 
        BT_DBG("");
 
+       if (!l2cap_is_socket(sock))
+               return -EBADFD;
+
        session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL);
        if (!session)
                return -ENOMEM;