Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c69163e9 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Marcel Holtmann
Browse files

Bluetooth: Move specific Basic Mode code to the right place 



Inside "case L2CAP_MODE_BASIC:" we don't need to check for sk_type and
L2CAP mode. So only the length check is fine.

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: default avatarJoão Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b9dbdbc1

net/bluetooth/l2cap.c

+6 −5
Original line number Diff line number Diff line
@@ -1611,11 +1611,6 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms 
	if (msg->msg_flags & MSG_OOB)

		return -EOPNOTSUPP;



	/* Check outgoing MTU */

	if (sk->sk_type == SOCK_SEQPACKET && pi->mode == L2CAP_MODE_BASIC &&

	    len > pi->omtu)

		return -EINVAL;



	lock_sock(sk);



	if (sk->sk_state != BT_CONNECTED) {
@@ -1635,6 +1630,12 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms 


	switch (pi->mode) {

	case L2CAP_MODE_BASIC:

		/* Check outgoing MTU */

		if (len > pi->omtu) {

			err = -EINVAL;

			goto done;

		}



		/* Create a basic PDU */

		skb = l2cap_create_basic_pdu(sk, msg, len);

		if (IS_ERR(skb)) {