Skip to contentSkip to conversation

Bluetooth: Various L2CAP fixes

PATCH Superseded [email protected] 2 participants 22 messages Sep 14, 2013 – Sep 16, 2013

Subsystems (2)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v3 cover Bluetooth: Various L2CAP fixes

Hi,

This set started off with just three patches but after looking into the code based on feedback from Marcel there were several other issues that were found which prompted for more patches.

Johan

----------------------------------------------------------------
Johan Hedberg (8):
Bluetooth: Remove unused event mask struct
Bluetooth: Fix L2CAP command reject reason
Bluetooth: Fix double error response for l2cap_create_chan_req
Bluetooth: Fix L2CAP Disconnect response for unknown CID
Bluetooth: Fix error code for invalid CID in l2cap_config_req
Bluetooth: Fix sending responses to identified L2CAP response packets
Bluetooth: Fix responding to invalid L2CAP signaling commands
Bluetooth: Fix waiting for clearing of BT_SK_SUSPEND flag

 include/net/bluetooth/bluetooth.h |  1 +
 include/net/bluetooth/hci.h       |  3 ---
 net/bluetooth/af_bluetooth.c      | 39 ++++++++++++++++++++++++++++++
 net/bluetooth/l2cap_core.c        | 48 +++++++++++++++++++++++++++----------
 net/bluetooth/l2cap_sock.c        |  6 +++++
 net/bluetooth/rfcomm/sock.c       |  9 +++++--
 6 files changed, 88 insertions(+), 18 deletions(-)
#1 lore raw

PATCH v3 1/8 Bluetooth: Remove unused event mask struct

From: Johan Hedberg <[email protected]>

The struct for HCI_Set_Event_Mask is never used. Instead a local 8-byte array is used for sending this command. Therefore, remove the unnecessary struct definition.

---
 include/net/bluetooth/hci.h | 3 ---
 1 file changed, 3 deletions(-)
include/net/bluetooth/hci.h +0 -3
index 57aa408..7ede266 100644
@@ -695,9 +695,6 @@ struct hci_cp_sniff_subrate {
 } __packed;
 
 #define HCI_OP_SET_EVENT_MASK		0x0c01
-struct hci_cp_set_event_mask {
-	__u8     mask[8];
-} __packed;
 
 #define HCI_OP_RESET			0x0c03
 
Signature · 1 line
1.8.4.rc3
maintainer Acked-by on v3 1/8
#2 lore raw

Re: [PATCH v3 1/8] Bluetooth: Remove unused event mask struct

Hi Johan,

Quoted 8 lines

The struct for HCI_Set_Event_Mask is never used. Instead a local 8-byte array is used for sending this command. Therefore, remove the unnecessary struct definition.

---
include/net/bluetooth/hci.h | 3 ---

1 file changed, 3 deletions(-)

Regards

Marcel

#3 lore raw

PATCH v3 2/8 Bluetooth: Fix L2CAP command reject reason

In reply to [email protected]

From: Johan Hedberg <[email protected]>

There are several possible reason codes that can be sent in the command reject L2CAP packet. Before this patch the code has used a hard-coded single response code ("command not understood"). This patch adds a helper function to map the return value of an L2CAP handler function to the correct command reject reason.

---
 net/bluetooth/l2cap_core.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)
net/bluetooth/l2cap_core.c +18 -4
index b3bb7bc..83acb28 100644
@@ -5294,6 +5294,20 @@ static inline int l2cap_le_sig_cmd(struct l2cap_conn *conn,
 	}
 }
 
+static u16 l2cap_err_to_reason(int err)
+{
+	switch (err) {
+	case -EFAULT:
+		return L2CAP_REJ_INVALID_CID;
+	case -EMSGSIZE:
+		return L2CAP_REJ_MTU_EXCEEDED;
+	case -EINVAL:
+	case -EPROTO:
+	default:
+		return L2CAP_REJ_NOT_UNDERSTOOD;
+	}
+}
+
 static inline void l2cap_le_sig_channel(struct l2cap_conn *conn,
 					struct sk_buff *skb)
 {
@@ -5323,11 +5337,11 @@ static inline void l2cap_le_sig_channel(struct l2cap_conn *conn,
 		err = l2cap_le_sig_cmd(conn, &cmd, data);
 		if (err) {
 			struct l2cap_cmd_rej_unk rej;
+			u16 reason = l2cap_err_to_reason(err);
 
 			BT_ERR("Wrong link type (%d)", err);
 
-			/* FIXME: Map err to a valid reason */
-			rej.reason = __constant_cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);
+			rej.reason = cpu_to_le16(reason);
 			l2cap_send_cmd(conn, cmd.ident, L2CAP_COMMAND_REJ,
 				       sizeof(rej), &rej);
 		}
@@ -5368,11 +5382,11 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn,
 		err = l2cap_bredr_sig_cmd(conn, &cmd, cmd_len, data);
 		if (err) {
 			struct l2cap_cmd_rej_unk rej;
+			u16 reason = l2cap_err_to_reason(err);
 
 			BT_ERR("Wrong link type (%d)", err);
 
-			/* FIXME: Map err to a valid reason */
-			rej.reason = __constant_cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);
+			rej.reason = cpu_to_le16(reason);
 			l2cap_send_cmd(conn, cmd.ident, L2CAP_COMMAND_REJ,
 				       sizeof(rej), &rej);
 		}
Signature · 1 line
1.8.4.rc3
maintainer
#4 lore raw

Re: [PATCH v3 2/8] Bluetooth: Fix L2CAP command reject reason

Hi Johan,

Quoted 16 lines

There are several possible reason codes that can be sent in the command reject L2CAP packet. Before this patch the code has used a hard-coded single response code ("command not understood"). This patch adds a helper function to map the return value of an L2CAP handler function to the correct command reject reason.

---
net/bluetooth/l2cap_core.c | 22 ++++++++++++++++++----

1 file changed, 18 insertions(+), 4 deletions(-)
net/bluetooth/l2cap_core.c +0 -0
index b3bb7bc..83acb28 100644

net/bluetooth/l2cap_core.c static inline int l2cap_le_sig_cmd(struct l2cap_conn *conn, · line 5297

Quoted 4 lines
net/bluetooth/l2cap_core.c +1 -0
@@ -5294,6 +5294,20 @@ static inline int l2cap_le_sig_cmd(struct l2cap_conn *conn,
 	}
 }
 
+static u16 l2cap_err_to_reason(int err)

what we could to is return __le16 here. And then keep using __constant_cpu_to_le16.

net/bluetooth/l2cap_core.c static inline int l2cap_le_sig_cmd(struct l2cap_conn *conn, · line 5309

Quoted 12 lines
net/bluetooth/l2cap_core.c +12 -0
+{
+	switch (err) {
+	case -EFAULT:
+		return L2CAP_REJ_INVALID_CID;
+	case -EMSGSIZE:
+		return L2CAP_REJ_MTU_EXCEEDED;
+	case -EINVAL:
+	case -EPROTO:
+	default:
+		return L2CAP_REJ_NOT_UNDERSTOOD;
+	}
+}

Is there really a point in listing EINVAL and EPROTO here.

Quoted 22 lines
net/bluetooth/l2cap_core.c +3 -2
+
 static inline void l2cap_le_sig_channel(struct l2cap_conn *conn,
 					struct sk_buff *skb)
 {
@@ -5323,11 +5337,11 @@ static inline void l2cap_le_sig_channel(struct l2cap_conn *conn,
 		err = l2cap_le_sig_cmd(conn, &cmd, data);
 		if (err) {
 			struct l2cap_cmd_rej_unk rej;
+			u16 reason = l2cap_err_to_reason(err);
 
 			BT_ERR("Wrong link type (%d)", err);
 
-			/* FIXME: Map err to a valid reason */
-			rej.reason = __constant_cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);
+			rej.reason = cpu_to_le16(reason);
 			l2cap_send_cmd(conn, cmd.ident, L2CAP_COMMAND_REJ,
 				       sizeof(rej), &rej);
 		}
@@ -5368,11 +5382,11 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn,
 		err = l2cap_bredr_sig_cmd(conn, &cmd, cmd_len, data);
 		if (err) {
 			struct l2cap_cmd_rej_unk rej;

net/bluetooth/l2cap_core.c static inline void l2cap_sig_channel(struct l2cap_conn *conn, · line 5392

Quoted 10 lines
net/bluetooth/l2cap_core.c +2 -2
+			u16 reason = l2cap_err_to_reason(err);
 
 			BT_ERR("Wrong link type (%d)", err);
 
-			/* FIXME: Map err to a valid reason */
-			rej.reason = __constant_cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);
+			rej.reason = cpu_to_le16(reason);
 			l2cap_send_cmd(conn, cmd.ident, L2CAP_COMMAND_REJ,
 				       sizeof(rej), &rej);
 		}

Regards

Marcel

#5 lore raw

Re: [PATCH v3 2/8] Bluetooth: Fix L2CAP command reject reason

Hi Marcel,

Quoted 19 lines · Marcel Holtmann
Quoted 19 lines

There are several possible reason codes that can be sent in the command reject L2CAP packet. Before this patch the code has used a hard-coded single response code ("command not understood"). This patch adds a helper function to map the return value of an L2CAP handler function to the correct command reject reason.

---
net/bluetooth/l2cap_core.c | 22 ++++++++++++++++++----

1 file changed, 18 insertions(+), 4 deletions(-)
net/bluetooth/l2cap_core.c +0 -0
index b3bb7bc..83acb28 100644
@@ -5294,6 +5294,20 @@ static inline int l2cap_le_sig_cmd(struct l2cap_conn *conn,
 	}
 }
 
Quoted 4 lines

net/bluetooth/l2cap_core.c static inline int l2cap_le_sig_cmd(struct l2cap_conn *conn, · line 5297

Quoted 1 line
net/bluetooth/l2cap_core.c +1 -0
+static u16 l2cap_err_to_reason(int err)

what we could to is return __le16 here. And then keep using __constant_cpu_to_le16.

I was mainly trying to follow the principle of using host endianness until the very moment when we actually encode into the protocol struct. However, I agree that we could be more pragmatic here since the only users of this function are places where we're directly encoding into the response PDU.

Quoted 6 lines
Quoted 6 lines
net/bluetooth/l2cap_core.c +6 -0
+{
+	switch (err) {
+	case -EFAULT:
+		return L2CAP_REJ_INVALID_CID;
+	case -EMSGSIZE:
+		return L2CAP_REJ_MTU_EXCEEDED;
Quoted 8 lines

net/bluetooth/l2cap_core.c static inline int l2cap_le_sig_cmd(struct l2cap_conn *conn, · line 5309

Quoted 6 lines
net/bluetooth/l2cap_core.c +6 -0
+	case -EINVAL:
+	case -EPROTO:
+	default:
+		return L2CAP_REJ_NOT_UNDERSTOOD;
+	}
+}

Is there really a point in listing EINVAL and EPROTO here.

I thought it would make it clear which error codes are recommended for parsing errors but I can remove them and just rely on default.

Johan

maintainer
#6 lore raw

Re: [PATCH v3 2/8] Bluetooth: Fix L2CAP command reject reason

Hi Johan,

Quoted 24 lines
Quoted 19 lines
Quoted 19 lines

There are several possible reason codes that can be sent in the command reject L2CAP packet. Before this patch the code has used a hard-coded single response code ("command not understood"). This patch adds a helper function to map the return value of an L2CAP handler function to the correct command reject reason.

---
net/bluetooth/l2cap_core.c | 22 ++++++++++++++++++----

1 file changed, 18 insertions(+), 4 deletions(-)
net/bluetooth/l2cap_core.c +0 -0
index b3bb7bc..83acb28 100644
@@ -5294,6 +5294,20 @@ static inline int l2cap_le_sig_cmd(struct l2cap_conn *conn,
 	}
 }
 
Quoted 4 lines

net/bluetooth/l2cap_core.c static inline int l2cap_le_sig_cmd(struct l2cap_conn *conn, · line 5297

Quoted 1 line
net/bluetooth/l2cap_core.c +1 -0
+static u16 l2cap_err_to_reason(int err)

what we could to is return __le16 here. And then keep using __constant_cpu_to_le16.

Quoted 5 lines

I was mainly trying to follow the principle of using host endianness until the very moment when we actually encode into the protocol struct. However, I agree that we could be more pragmatic here since the only users of this function are places where we're directly encoding into the response PDU.

the thing is that within the kernel you can nicely mark the endian of the return value with __le16. So tools like sparse will warn you if you mess it up.

Quoted 15 lines
Quoted 6 lines
Quoted 6 lines
net/bluetooth/l2cap_core.c +6 -0
+{
+	switch (err) {
+	case -EFAULT:
+		return L2CAP_REJ_INVALID_CID;
+	case -EMSGSIZE:
+		return L2CAP_REJ_MTU_EXCEEDED;
Quoted 8 lines

net/bluetooth/l2cap_core.c static inline int l2cap_le_sig_cmd(struct l2cap_conn *conn, · line 5309

Quoted 6 lines
net/bluetooth/l2cap_core.c +6 -0
+	case -EINVAL:
+	case -EPROTO:
+	default:
+		return L2CAP_REJ_NOT_UNDERSTOOD;
+	}
+}

Is there really a point in listing EINVAL and EPROTO here.

Quoted 2 lines

I thought it would make it clear which error codes are recommended for parsing errors but I can remove them and just rely on default.

I am fine keeping them. Just asking.

Regards

Marcel

#7 lore raw

PATCH v3 3/8 Bluetooth: Fix double error response for l2cap_create_chan_req

In reply to [email protected]

From: Johan Hedberg <[email protected]>

When an L2CAP request handler returns non-zero the calling code will send a command reject response. The l2cap_create_chan_req function will in some cases send its own response but then still return a -EFAULT error which would cause two responses to be sent. This patch fixes this by making the function return 0 after sending its own response.

---
 net/bluetooth/l2cap_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +1 -1
index 83acb28..6515804 100644
@@ -4462,7 +4462,7 @@ error:
 	l2cap_send_cmd(conn, cmd->ident, L2CAP_CREATE_CHAN_RSP,
 		       sizeof(rsp), &rsp);
 
-	return -EFAULT;
+	return 0;
 }
 
 static void l2cap_send_move_chan_req(struct l2cap_chan *chan, u8 dest_amp_id)
Signature · 1 line
1.8.4.rc3
#8 lore raw

PATCH v3 4/8 Bluetooth: Fix L2CAP Disconnect response for unknown CID

In reply to [email protected]

From: Johan Hedberg <[email protected]>

If we receive an L2CAP Disconnect Request for an unknown CID we should not just silently drop it but reply with a proper Command Reject response. This patch fixes this by ensuring that the disconnect handler returns a proper error instead of 0 and will cause the function caller to send the right response.

---
 net/bluetooth/l2cap_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +1 -1
index 6515804..9ec1561f 100644
@@ -4206,7 +4206,7 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn,
 	chan = __l2cap_get_chan_by_scid(conn, dcid);
 	if (!chan) {
 		mutex_unlock(&conn->chan_lock);
-		return 0;
+		return -EFAULT;
 	}
 
 	l2cap_chan_lock(chan);
Signature · 1 line
1.8.4.rc3
#9 lore raw

PATCH v3 5/8 Bluetooth: Fix error code for invalid CID in l2cap_config_req

In reply to [email protected]

From: Johan Hedberg <[email protected]>

The convention of the L2CAP code is to return EFAULT when a CID in the request packet is invalid. This patch fixes the l2cap_config_req to use that error code instead of ENOENT.

---
 net/bluetooth/l2cap_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +1 -1
index 9ec1561f..d134501 100644
@@ -3978,7 +3978,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn,
 
 	chan = l2cap_get_chan_by_scid(conn, dcid);
 	if (!chan)
-		return -ENOENT;
+		return -EFAULT;
 
 	if (chan->state != BT_CONFIG && chan->state != BT_CONNECT2) {
 		struct l2cap_cmd_rej_cid rej;
Signature · 1 line
1.8.4.rc3
maintainer
#10 lore raw

Re: [PATCH v3 5/8] Bluetooth: Fix error code for invalid CID in l2cap_config_req

Hi Johan,

Quoted 14 lines

The convention of the L2CAP code is to return EFAULT when a CID in the request packet is invalid. This patch fixes the l2cap_config_req to use that error code instead of ENOENT.

---
net/bluetooth/l2cap_core.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +0 -0
index 9ec1561f..d134501 100644

net/bluetooth/l2cap_core.c static inline int l2cap_config_req(struct l2cap_conn *conn, · line 3981

Quoted 5 lines
net/bluetooth/l2cap_core.c +1 -1
@@ -3978,7 +3978,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn,
 
 	chan = l2cap_get_chan_by_scid(conn, dcid);
 	if (!chan)
-		return -ENOENT;
+		return -EFAULT;

do we really want to use EFAULT. That is normally only used if a memory copy from userspace to kernel or vice versa fails.

Regards

Marcel

#11 lore raw

Re: [PATCH v3 5/8] Bluetooth: Fix error code for invalid CID in l2cap_config_req

Hi Marcel,

Quoted 15 lines · Marcel Holtmann
Quoted 15 lines

The convention of the L2CAP code is to return EFAULT when a CID in the request packet is invalid. This patch fixes the l2cap_config_req to use that error code instead of ENOENT.

---
net/bluetooth/l2cap_core.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +0 -0
index 9ec1561f..d134501 100644
@@ -3978,7 +3978,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn,
 
Quoted 7 lines

net/bluetooth/l2cap_core.c static inline int l2cap_config_req(struct l2cap_conn *conn, · line 3981

Quoted 4 lines
net/bluetooth/l2cap_core.c +1 -1
 	chan = l2cap_get_chan_by_scid(conn, dcid);
 	if (!chan)
-		return -ENOENT;
+		return -EFAULT;

do we really want to use EFAULT. That is normally only used if a memory copy from userspace to kernel or vice versa fails.

EFAULT seemed to be the most common error code in this case, but now that I did some research it seems it's mostly from newish AMP related code. Would you be ok if I just switch all places to use ENOENT then?

Johan

maintainer
#12 lore raw

Re: [PATCH v3 5/8] Bluetooth: Fix error code for invalid CID in l2cap_config_req

Hi Johan,

Quoted 23 lines
Quoted 15 lines
Quoted 15 lines

The convention of the L2CAP code is to return EFAULT when a CID in the request packet is invalid. This patch fixes the l2cap_config_req to use that error code instead of ENOENT.

---
net/bluetooth/l2cap_core.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +0 -0
index 9ec1561f..d134501 100644
@@ -3978,7 +3978,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn,
 
Quoted 7 lines

net/bluetooth/l2cap_core.c static inline int l2cap_config_req(struct l2cap_conn *conn, · line 3981

Quoted 4 lines
net/bluetooth/l2cap_core.c +1 -1
 	chan = l2cap_get_chan_by_scid(conn, dcid);
 	if (!chan)
-		return -ENOENT;
+		return -EFAULT;

do we really want to use EFAULT. That is normally only used if a memory copy from userspace to kernel or vice versa fails.

Quoted 3 lines

EFAULT seemed to be the most common error code in this case, but now that I did some research it seems it's mostly from newish AMP related code. Would you be ok if I just switch all places to use ENOENT then?

EFAULT is really for memory address errors. It is a pretty bad idea to use CID errors.

I am fine with keep using ENOENT if we used that before. If that is what the original code used, then lets keep using it. Otherwise we better find a more descriptive error.

Regards

Marcel

#13 lore raw

Re: [PATCH v3 5/8] Bluetooth: Fix error code for invalid CID in l2cap_config_req

Hi Marcel,

Quoted 27 lines · Marcel Holtmann
Quoted 23 lines
Quoted 15 lines
Quoted 15 lines

The convention of the L2CAP code is to return EFAULT when a CID in the request packet is invalid. This patch fixes the l2cap_config_req to use that error code instead of ENOENT.

---
net/bluetooth/l2cap_core.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +0 -0
index 9ec1561f..d134501 100644
@@ -3978,7 +3978,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn,
 
Quoted 7 lines

net/bluetooth/l2cap_core.c static inline int l2cap_config_req(struct l2cap_conn *conn, · line 3981

Quoted 4 lines
net/bluetooth/l2cap_core.c +1 -1
 	chan = l2cap_get_chan_by_scid(conn, dcid);
 	if (!chan)
-		return -ENOENT;
+		return -EFAULT;

do we really want to use EFAULT. That is normally only used if a memory copy from userspace to kernel or vice versa fails.

Quoted 3 lines

EFAULT seemed to be the most common error code in this case, but now that I did some research it seems it's mostly from newish AMP related code. Would you be ok if I just switch all places to use ENOENT then?

Quoted 5 lines

EFAULT is really for memory address errors. It is a pretty bad idea to use CID errors.

I am fine with keep using ENOENT if we used that before. If that is what the original code used, then lets keep using it. Otherwise we better find a more descriptive error.

If we ignore new AMP code there's only one "legacy" reference for this kind of situation which is l2cap_config_req. Since it has always used ENOENT for a failed CID lookup I'll follow that lead and use the same error for all places that need it.

Johan

maintainer
#14 lore raw

Re: [PATCH v3 5/8] Bluetooth: Fix error code for invalid CID in l2cap_config_req

Hi Johan,

Quoted 29 lines
Quoted 29 lines
Quoted 23 lines
Quoted 15 lines
Quoted 15 lines

The convention of the L2CAP code is to return EFAULT when a CID in the request packet is invalid. This patch fixes the l2cap_config_req to use that error code instead of ENOENT.

---
net/bluetooth/l2cap_core.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +0 -0
index 9ec1561f..d134501 100644
@@ -3978,7 +3978,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn,
 
Quoted 7 lines

net/bluetooth/l2cap_core.c static inline int l2cap_config_req(struct l2cap_conn *conn, · line 3981

Quoted 4 lines
net/bluetooth/l2cap_core.c +1 -1
 	chan = l2cap_get_chan_by_scid(conn, dcid);
 	if (!chan)
-		return -ENOENT;
+		return -EFAULT;

do we really want to use EFAULT. That is normally only used if a memory copy from userspace to kernel or vice versa fails.

Quoted 3 lines

EFAULT seemed to be the most common error code in this case, but now that I did some research it seems it's mostly from newish AMP related code. Would you be ok if I just switch all places to use ENOENT then?

EFAULT is really for memory address errors. It is a pretty bad idea to use CID errors.

Quoted 8 lines
Quoted 3 lines

I am fine with keep using ENOENT if we used that before. If that is what the original code used, then lets keep using it. Otherwise we better find a more descriptive error.

If we ignore new AMP code there's only one "legacy" reference for this kind of situation which is l2cap_config_req. Since it has always used ENOENT for a failed CID lookup I'll follow that lead and use the same error for all places that need it.

have a look at EBADRQC, EBADSLT, EBADR or EBADE. They might be a better choice.

Regards

Marcel

#15 lore raw

Re: [PATCH v3 5/8] Bluetooth: Fix error code for invalid CID in l2cap_config_req

Hi Marcel,

Quoted 33 lines · Marcel Holtmann
Quoted 33 lines
Quoted 32 lines
Quoted 23 lines
Quoted 15 lines
Quoted 15 lines

The convention of the L2CAP code is to return EFAULT when a CID in the request packet is invalid. This patch fixes the l2cap_config_req to use that error code instead of ENOENT.

---
net/bluetooth/l2cap_core.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +0 -0
index 9ec1561f..d134501 100644
@@ -3978,7 +3978,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn,
 
Quoted 7 lines

net/bluetooth/l2cap_core.c static inline int l2cap_config_req(struct l2cap_conn *conn, · line 3981

Quoted 4 lines
net/bluetooth/l2cap_core.c +1 -1
 	chan = l2cap_get_chan_by_scid(conn, dcid);
 	if (!chan)
-		return -ENOENT;
+		return -EFAULT;

do we really want to use EFAULT. That is normally only used if a memory copy from userspace to kernel or vice versa fails.

Quoted 3 lines

EFAULT seemed to be the most common error code in this case, but now that I did some research it seems it's mostly from newish AMP related code. Would you be ok if I just switch all places to use ENOENT then?

EFAULT is really for memory address errors. It is a pretty bad idea to use CID errors.

I am fine with keep using ENOENT if we used that before. If that is what the original code used, then lets keep using it. Otherwise we better find a more descriptive error.

Quoted 7 lines
Quoted 4 lines

If we ignore new AMP code there's only one "legacy" reference for this kind of situation which is l2cap_config_req. Since it has always used ENOENT for a failed CID lookup I'll follow that lead and use the same error for all places that need it.

have a look at EBADRQC, EBADSLT, EBADR or EBADE. They might be a better choice.

I'd rather have a consensus here first before resending the entire patch set yet another time because of this issue (which, let's face it, is not about any public API but consistency inside a single c-file).

As quite often with trying to map POSIX error codes to our own domain we've ended up here with trying to find the "least bad" option in the absence of a single obviously correct one.

EBADRQC sounds like it's not related to PDU parameters but the request code of the PDU. EBADSLT is "invalid slot", so if we consider the CID to be a "slot" this might be an option. EBADR talks about a "request descriptor" which I don't quite understand how it's different from a "request code". EBADE means "invalid exchange" whereas this isn't really about an exchange but just an incorrect CID in a PDU.

I agree that ENOENT isn't perfect either since, even though internally this is about a failed lookup, externally this is just the peer sending us an invalid parameter value. Therefore, we could even consider EINVAL if it wasn't for the fact that it's already used e.g. when we receive an unknown opcode.

In the end I'm willing to accept pretty much any of the proposed options since there really isn't a single right answer to this and since this is not about public API that we really need to stick to once we decide which value to use. The important thing is that the code is kept consistent regarding the use of this error.

Johan

maintainer
#16 lore raw

Re: [PATCH v3 5/8] Bluetooth: Fix error code for invalid CID in l2cap_config_req

Hi Johan,

Quoted 62 lines
Quoted 33 lines
Quoted 33 lines
Quoted 32 lines
Quoted 23 lines
Quoted 15 lines
Quoted 15 lines

The convention of the L2CAP code is to return EFAULT when a CID in the request packet is invalid. This patch fixes the l2cap_config_req to use that error code instead of ENOENT.

---
net/bluetooth/l2cap_core.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +0 -0
index 9ec1561f..d134501 100644
@@ -3978,7 +3978,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn,
 
Quoted 7 lines

net/bluetooth/l2cap_core.c static inline int l2cap_config_req(struct l2cap_conn *conn, · line 3981

Quoted 4 lines
net/bluetooth/l2cap_core.c +1 -1
 	chan = l2cap_get_chan_by_scid(conn, dcid);
 	if (!chan)
-		return -ENOENT;
+		return -EFAULT;

do we really want to use EFAULT. That is normally only used if a memory copy from userspace to kernel or vice versa fails.

Quoted 3 lines

EFAULT seemed to be the most common error code in this case, but now that I did some research it seems it's mostly from newish AMP related code. Would you be ok if I just switch all places to use ENOENT then?

EFAULT is really for memory address errors. It is a pretty bad idea to use CID errors.

I am fine with keep using ENOENT if we used that before. If that is what the original code used, then lets keep using it. Otherwise we better find a more descriptive error.

Quoted 7 lines
Quoted 4 lines

If we ignore new AMP code there's only one "legacy" reference for this kind of situation which is l2cap_config_req. Since it has always used ENOENT for a failed CID lookup I'll follow that lead and use the same error for all places that need it.

have a look at EBADRQC, EBADSLT, EBADR or EBADE. They might be a better choice.

I'd rather have a consensus here first before resending the entire patch set yet another time because of this issue (which, let's face it, is not about any public API but consistency inside a single c-file).

As quite often with trying to map POSIX error codes to our own domain we've ended up here with trying to find the "least bad" option in the absence of a single obviously correct one.

EBADRQC sounds like it's not related to PDU parameters but the request code of the PDU. EBADSLT is "invalid slot", so if we consider the CID to be a "slot" this might be an option. EBADR talks about a "request descriptor" which I don't quite understand how it's different from a "request code". EBADE means "invalid exchange" whereas this isn't really about an exchange but just an incorrect CID in a PDU.

I agree that ENOENT isn't perfect either since, even though internally this is about a failed lookup, externally this is just the peer sending us an invalid parameter value. Therefore, we could even consider EINVAL if it wasn't for the fact that it's already used e.g. when we receive an unknown opcode.

Quoted 5 lines

In the end I'm willing to accept pretty much any of the proposed options since there really isn't a single right answer to this and since this is not about public API that we really need to stick to once we decide which value to use. The important thing is that the code is kept consistent regarding the use of this error.

I have nothing against ENOENT. I however am a bit concerned about that we accidentally use ENOENT in some other case and end up overloading its meaning.

So just for the sake of making this unique, I would consider going with EBADSLT. I am not married to this at all. However I wanted to have this talked through so that we understand the whole picture. If I would know the perfect answer, I would have just forced you to use it ;)

If you want to keep using ENOENT, then I will sign off your current patches.

Regards

Marcel

#17 lore raw

Re: [PATCH v3 5/8] Bluetooth: Fix error code for invalid CID in l2cap_config_req

Hi Marcel,

Quoted 9 lines · Marcel Holtmann

I have nothing against ENOENT. I however am a bit concerned about that we accidentally use ENOENT in some other case and end up overloading its meaning.

So just for the sake of making this unique, I would consider going with EBADSLT. I am not married to this at all. However I wanted to have this talked through so that we understand the whole picture. If I would know the perfect answer, I would have just forced you to use it ;)

I really don't have a strong opinion one way or another, both seem good enough to me, but since ENOENT has you feeling a bit uneasy I'll change this to EBADSLT for the next revision (which will hopefully be the last one for this error code issue).

Johan

#18 lore raw

PATCH v3 6/8 Bluetooth: Fix sending responses to identified L2CAP response packets

In reply to [email protected]

From: Johan Hedberg <[email protected]>

When L2CAP packets return a non-zero error and the value is passed onwards by l2cap_bredr_sig_cmd this will trigger a command reject packet to be sent. However, the core specification (page 1416 in core 4.0) says the following: "Command Reject packets should not be sent in response to an identified Response packet.".

This patch ensures that a command reject packet is not sent for any identified response packet by ignoring the error return value from the response handler functions.

---
 net/bluetooth/l2cap_core.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
net/bluetooth/l2cap_core.c +6 -6
index d134501..7d36051 100644
@@ -5212,7 +5212,7 @@ static inline int l2cap_bredr_sig_cmd(struct l2cap_conn *conn,
 
 	case L2CAP_CONN_RSP:
 	case L2CAP_CREATE_CHAN_RSP:
-		err = l2cap_connect_create_rsp(conn, cmd, cmd_len, data);
+		l2cap_connect_create_rsp(conn, cmd, cmd_len, data);
 		break;
 
 	case L2CAP_CONF_REQ:
@@ -5220,7 +5220,7 @@ static inline int l2cap_bredr_sig_cmd(struct l2cap_conn *conn,
 		break;
 
 	case L2CAP_CONF_RSP:
-		err = l2cap_config_rsp(conn, cmd, cmd_len, data);
+		l2cap_config_rsp(conn, cmd, cmd_len, data);
 		break;
 
 	case L2CAP_DISCONN_REQ:
@@ -5228,7 +5228,7 @@ static inline int l2cap_bredr_sig_cmd(struct l2cap_conn *conn,
 		break;
 
 	case L2CAP_DISCONN_RSP:
-		err = l2cap_disconnect_rsp(conn, cmd, cmd_len, data);
+		l2cap_disconnect_rsp(conn, cmd, cmd_len, data);
 		break;
 
 	case L2CAP_ECHO_REQ:
@@ -5243,7 +5243,7 @@ static inline int l2cap_bredr_sig_cmd(struct l2cap_conn *conn,
 		break;
 
 	case L2CAP_INFO_RSP:
-		err = l2cap_information_rsp(conn, cmd, cmd_len, data);
+		l2cap_information_rsp(conn, cmd, cmd_len, data);
 		break;
 
 	case L2CAP_CREATE_CHAN_REQ:
@@ -5255,7 +5255,7 @@ static inline int l2cap_bredr_sig_cmd(struct l2cap_conn *conn,
 		break;
 
 	case L2CAP_MOVE_CHAN_RSP:
-		err = l2cap_move_channel_rsp(conn, cmd, cmd_len, data);
+		l2cap_move_channel_rsp(conn, cmd, cmd_len, data);
 		break;
 
 	case L2CAP_MOVE_CHAN_CFM:
@@ -5263,7 +5263,7 @@ static inline int l2cap_bredr_sig_cmd(struct l2cap_conn *conn,
 		break;
 
 	case L2CAP_MOVE_CHAN_CFM_RSP:
-		err = l2cap_move_channel_confirm_rsp(conn, cmd, cmd_len, data);
+		l2cap_move_channel_confirm_rsp(conn, cmd, cmd_len, data);
 		break;
 
 	default:
Signature · 1 line
1.8.4.rc3
maintainer Acked-by on v3 6/8
#19 lore raw

Re: [PATCH v3 6/8] Bluetooth: Fix sending responses to identified L2CAP response packets

Hi Johan,

Quoted 6 lines

When L2CAP packets return a non-zero error and the value is passed onwards by l2cap_bredr_sig_cmd this will trigger a command reject packet to be sent. However, the core specification (page 1416 in core 4.0) says the following: "Command Reject packets should not be sent in response to an identified Response packet.".

Quoted 8 lines

This patch ensures that a command reject packet is not sent for any identified response packet by ignoring the error return value from the response handler functions.

---
net/bluetooth/l2cap_core.c | 12 ++++++------

1 file changed, 6 insertions(+), 6 deletions(-)

Regards

Marcel

#20 lore raw

PATCH v3 7/8 Bluetooth: Fix responding to invalid L2CAP signaling commands

In reply to [email protected]

From: Johan Hedberg <[email protected]>

When we have an LE link we should not respond to any data on the BR/EDR L2CAP signaling channel (0x0001) and vice-versa when we have a BR/EDR link we should not respond to LE L2CAP (CID 0x0005) signaling commands. This patch fixes this issue by checking for a valid link type and ignores data if it is wrong.

---
 net/bluetooth/l2cap_core.c | 8 ++++++++
 1 file changed, 8 insertions(+)
net/bluetooth/l2cap_core.c +8 -0
index 7d36051..247a955 100644
@@ -5311,6 +5311,7 @@ static u16 l2cap_err_to_reason(int err)
 static inline void l2cap_le_sig_channel(struct l2cap_conn *conn,
 					struct sk_buff *skb)
 {
+	struct hci_conn *hcon = conn->hcon;
 	u8 *data = skb->data;
 	int len = skb->len;
 	struct l2cap_cmd_hdr cmd;
@@ -5318,6 +5319,9 @@ static inline void l2cap_le_sig_channel(struct l2cap_conn *conn,
 
 	l2cap_raw_recv(conn, skb);
 
+	if (hcon->type != LE_LINK)
+		return;
+
 	while (len >= L2CAP_CMD_HDR_SIZE) {
 		u16 cmd_len;
 		memcpy(&cmd, data, L2CAP_CMD_HDR_SIZE);
@@ -5356,6 +5360,7 @@ static inline void l2cap_le_sig_channel(struct l2cap_conn *conn,
 static inline void l2cap_sig_channel(struct l2cap_conn *conn,
 				     struct sk_buff *skb)
 {
+	struct hci_conn *hcon = conn->hcon;
 	u8 *data = skb->data;
 	int len = skb->len;
 	struct l2cap_cmd_hdr cmd;
@@ -5363,6 +5368,9 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn,
 
 	l2cap_raw_recv(conn, skb);
 
+	if (hcon->type != ACL_LINK)
+		return;
+
 	while (len >= L2CAP_CMD_HDR_SIZE) {
 		u16 cmd_len;
 		memcpy(&cmd, data, L2CAP_CMD_HDR_SIZE);
Signature · 1 line
1.8.4.rc3
#21 lore raw

PATCH v3 8/8 Bluetooth: Fix waiting for clearing of BT_SK_SUSPEND flag

In reply to [email protected]

From: Johan Hedberg <[email protected]>

In the case of blocking sockets we should not proceed with sendmsg() if the socket has the BT_SK_SUSPEND flag set. So far the code was only ensuring that POLLOUT doesn't get set for non-blocking sockets using poll() but there was no code in place to ensure that blocking sockets do the right thing when writing to them.

This patch adds a new bt_sock_wait_ready helper function to sleep in the sendmsg call if the BT_SK_SUSPEND flag is set, and wake up as soon as it is unset. It also updates the L2CAP and RFCOMM sendmsg callbacks to take advantage of this new helper function.

---
v3: Use wait_ready instead of wait_unsuspend

 include/net/bluetooth/bluetooth.h |  1 +
 net/bluetooth/af_bluetooth.c      | 39 +++++++++++++++++++++++++++++++++++++++
 net/bluetooth/l2cap_sock.c        |  6 ++++++
 net/bluetooth/rfcomm/sock.c       |  9 +++++++--
 4 files changed, 53 insertions(+), 2 deletions(-)
include/net/bluetooth/bluetooth.h +1 -0
index 10d43d8..afbc711 100644
@@ -249,6 +249,7 @@ int  bt_sock_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
 uint bt_sock_poll(struct file *file, struct socket *sock, poll_table *wait);
 int  bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 int  bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo);
+int  bt_sock_wait_ready(struct sock *sk, unsigned long flags);
 
 void bt_accept_enqueue(struct sock *parent, struct sock *sk);
 void bt_accept_unlink(struct sock *sk);
net/bluetooth/af_bluetooth.c +39 -0
index 9096137..a883171c 100644
@@ -525,6 +525,45 @@ int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo)
 }
 EXPORT_SYMBOL(bt_sock_wait_state);
 
+int bt_sock_wait_ready(struct sock *sk, unsigned long flags)
+{
+	DECLARE_WAITQUEUE(wait, current);
+	unsigned long timeo;
+	int err = 0;
+
+	BT_DBG("sk %p", sk);
+
+	timeo = sock_sndtimeo(sk, flags & O_NONBLOCK);
+
+	add_wait_queue(sk_sleep(sk), &wait);
+	set_current_state(TASK_INTERRUPTIBLE);
+	while (test_bit(BT_SK_SUSPEND, &bt_sk(sk)->flags)) {
+		if (!timeo) {
+			err = -EAGAIN;
+			break;
+		}
+
+		if (signal_pending(current)) {
+			err = sock_intr_errno(timeo);
+			break;
+		}
+
+		release_sock(sk);
+		timeo = schedule_timeout(timeo);
+		lock_sock(sk);
+		set_current_state(TASK_INTERRUPTIBLE);
+
+		err = sock_error(sk);
+		if (err)
+			break;
+	}
+	__set_current_state(TASK_RUNNING);
+	remove_wait_queue(sk_sleep(sk), &wait);
+
+	return err;
+}
+EXPORT_SYMBOL(bt_sock_wait_ready);
+
 #ifdef CONFIG_PROC_FS
 struct bt_seq_state {
 	struct bt_sock_list *l;
net/bluetooth/l2cap_sock.c +6 -0
index 0098af8..ad95b42 100644
@@ -777,6 +777,12 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
 	if (sk->sk_state != BT_CONNECTED)
 		return -ENOTCONN;
 
+	lock_sock(sk);
+	err = bt_sock_wait_ready(sk, msg->msg_flags);
+	release_sock(sk);
+	if (err)
+		return err;
+
 	l2cap_chan_lock(chan);
 	err = l2cap_chan_send(chan, msg, len, sk->sk_priority);
 	l2cap_chan_unlock(chan);
net/bluetooth/rfcomm/sock.c +7 -2
index 30b3721..02d96e4 100644
@@ -544,7 +544,7 @@ static int rfcomm_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
 	struct sock *sk = sock->sk;
 	struct rfcomm_dlc *d = rfcomm_pi(sk)->dlc;
 	struct sk_buff *skb;
-	int sent = 0;
+	int err, sent = 0;
 
 	if (test_bit(RFCOMM_DEFER_SETUP, &d->flags))
 		return -ENOTCONN;
@@ -559,9 +559,14 @@ static int rfcomm_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
 
 	lock_sock(sk);
 
+	err = bt_sock_wait_ready(sk, msg->msg_flags);
+	if (err) {
+		release_sock(sk);
+		return err;
+	}
+
 	while (len) {
 		size_t size = min_t(size_t, len, d->mtu);
-		int err;
 
 		skb = sock_alloc_send_skb(sk, size + RFCOMM_SKB_RESERVE,
 				msg->msg_flags & MSG_DONTWAIT, &err);
Signature · 1 line
1.8.4.rc3