Commit bd6409bb authored Dec 19, 2014 by Al Viro Committed by Greg Kroah-Hartman Aug 11, 2017

Bluetooth: cmtp: cmtp_add_connection() should verify that it's dealing with l2cap socket



commit 96c26653ce65bf84f3212f8b00d4316c1efcbf4c upstream.

... 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent be7c0da3

net/bluetooth/cmtp/core.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;