Bluetooth: Add BT_MODE socket option
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/1 Bluetooth: Add BT_MODE socket option
From: Luiz Augusto von Dentz <[email protected]>
This adds BT_MODE socket option which can be used to set L2CAP modes, including modes only supported over LE which were not supported using the L2CAP_OPTIONS.
--- include/net/bluetooth/bluetooth.h | 8 ++ net/bluetooth/l2cap_sock.c | 120 +++++++++++++++++++++++++++++- 2 files changed, 127 insertions(+), 1 deletion(-)
include/net/bluetooth/bluetooth.h +8 -0
@@ -139,6 +139,14 @@ struct bt_voice {#define BT_PHY_LE_CODED_TX 0x00002000#define BT_PHY_LE_CODED_RX 0x00004000 +#define BT_MODE 15 + +#define BT_MODE_BASIC 0x00 +#define BT_MODE_ERTM 0x01 +#define BT_MODE_STREAMING 0x02 +#define BT_MODE_LE_FLOWCTL 0x03 +#define BT_MODE_EXT_FLOWCTL 0x04 + __printf(1, 2)void bt_info (const char *fmt, ...);__printf (1 ,2 )
net/bluetooth/l2cap_sock.c +119 -1
156 lines not on this page · raw message
Signature · 1 line
2.21.1
Marcel Holtmann
maintainerHi Luiz,
Quoted 60 lines
This adds
BT_MODEsocket option which can be used to set L2CAP modes, including modes only supported over LE which were not supported using theL2CAP_OPTIONS.Signed-off-by Luiz Augusto von Dentz <[email protected]>---
include/net/bluetooth/bluetooth.h| 8 ++net/bluetooth/l2cap_sock.c| 120 +++++++++++++++++++++++++++++-2 files changed, 127 insertions(+), 1 deletion(-)include/net/bluetooth/bluetooth.h +8
-0@@ -139,6 +139,14 @@ struct bt_voice {#define BT_PHY_LE_CODED_TX 0x00002000#define BT_PHY_LE_CODED_RX 0x00004000 +#define BT_MODE 15 + +#define BT_MODE_BASIC 0x00 +#define BT_MODE_ERTM 0x01 +#define BT_MODE_STREAMING 0x02 +#define BT_MODE_LE_FLOWCTL 0x03 +#define BT_MODE_EXT_FLOWCTL 0x04 + __printf(1, 2)void bt_info (const char *fmt, ...);
__printf(1, 2)net/bluetooth/l2cap_sock.c +18
-0@@ -395,6 +395,24 @@ static int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr,return sizeof (struct sockaddr_l2 ); } +static int l2cap_get_mode (struct l2cap_chan *chan) +{ +switch (chan->mode) { +case L2CAP_MODE_BASIC : +return BT_MODE_BASIC ; +case L2CAP_MODE_ERTM : +return BT_MODE_ERTM ; +case L2CAP_MODE_STREAMING : +return BT_MODE_STREAMING ; +case L2CAP_MODE_LE_FLOWCTL : +return BT_MODE_LE_FLOWCTL ; +case L2CAP_MODE_EXT_FLOWCTL : +return BT_MODE_EXT_FLOWCTL ; + } + +return -EINVAL ; +} +static int l2cap_sock_getsockopt_old (struct socket *sock,int optname,char __user *optval,int __user *optlen) {
net/bluetooth/l2cap_sock.c static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, · line 451
Quoted 10 lines
net/bluetooth/l2cap_sock.c +7
-0@@ -424,6 +442,13 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,break ; } +/* L2CAP_MODE_LE_FLOWCTL and L2CAP_MODE_EXT_FLOWCTL are not +* supported by L2CAP_OPTIONS. +*/ +if (chan->mode ==L2CAP_MODE_LE_FLOWCTL || + chan->mode ==L2CAP_MODE_EXT_FLOWCTL ) +return -EINVAL ; +
I might have done a positive check here.
switch (chan->mode) {
case L2CAP_MODE_BASIC:
case L2CAP_MODE_ERTM:
case L2CAP_MODE_STREAMING:
break;
default:
return -EINVAL;
}Anyhow, I also realized that in l2cap_sock_setsockopt_old we are allowing L2CAP_MODE_LE_FLOWCTL. I think we want to make that one return EINVAL as well. However that should be a separate patch just in case we need to revert it.
That said, I would leave L2CAP_MODE_LE_FLOWCTL in here initially and then remove it with the same patch that removes it from setsockopt_old. Lets check our userspace first if it handles this all correctly for LE connections (not that L2CAP LE connection oriented channels are used much).
Quoted 116 lines
net/bluetooth/l2cap_sock.c +87
-1memset (&opts,0 ,sizeof (opts)); opts.imtu = chan->imtu; opts.omtu = chan->omtu;@@ -508,7 +533,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,struct bt_security sec;struct bt_power pwr;u32 phys; -int len, err =0 ; +int len, mode, err =0 ;BT_DBG ("sk %p" , sk);@@ -624,6 +649,27 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, err = -EFAULT ;break ; +case BT_MODE : +if (!enable_ecred) { + err = -ENOPROTOOPT ; +break ; + } + +if (chan->chan_type !=L2CAP_CHAN_CONN_ORIENTED ) { + err = -EINVAL ; +break ; + } + + mode =l2cap_get_mode (chan); +if (mode <0 ) { + err = mode; +break ; + } + +if (put_user (mode, (u8 __user *) optval)) + err = -EFAULT ; +break ; +default : err = -ENOPROTOOPT ;break ;@@ -763,6 +809,45 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,return err; } +static int l2cap_set_mode (struct l2cap_chan *chan,u8 mode) +{ +switch (mode) { +case BT_MODE_BASIC : +if (bdaddr_type_is_le (chan->src_type)) +return -EINVAL ; + mode =L2CAP_MODE_BASIC ; +clear_bit (CONF_STATE2_DEVICE , &chan->conf_state); +break ; +case BT_MODE_ERTM : +if (!disable_ertm ||bdaddr_type_is_le (chan->src_type)) +return -EINVAL ; + mode =L2CAP_MODE_ERTM ; +break ; +case BT_MODE_STREAMING : +if (!disable_ertm ||bdaddr_type_is_le (chan->src_type)) +return -EINVAL ; + mode =L2CAP_MODE_STREAMING ; +break ; +case BT_MODE_LE_FLOWCTL : +if (!bdaddr_type_is_le (chan->src_type)) +return -EINVAL ; + mode =L2CAP_MODE_LE_FLOWCTL ; +break ; +case BT_MODE_EXT_FLOWCTL : +/* TODO: Add support for ECRED PDUs to BR/EDR */ +if (!bdaddr_type_is_le (chan->src_type)) +return -EINVAL ; + mode =L2CAP_MODE_EXT_FLOWCTL ; +break ; +default : +return -EINVAL ; + } + + chan->mode = mode; + +return 0 ; +} +static int l2cap_sock_setsockopt (struct socket *sock,int level,int optname,char __user *optval,unsigned int optlen) {@@ -968,6 +1053,39 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ; +case BT_MODE : +if (!enable_ecred) { + err = -ENOPROTOOPT ; +break ; + } + +BT_DBG ("sk->sk_state %u" , sk->sk_state); + +if (sk->sk_state !=BT_BOUND ) { + err = -EINVAL ; +break ; + } + +if (chan->chan_type !=L2CAP_CHAN_CONN_ORIENTED ) { + err = -EINVAL ; +break ; + } + +if (get_user (opt, (u8 __user *) optval)) { + err = -EFAULT ; +break ; + } + +BT_DBG ("opt %u" , opt); + + err =l2cap_set_mode (chan, opt);
net/bluetooth/l2cap_sock.c static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, · line 1091
Quoted 10 lines
net/bluetooth/l2cap_sock.c +7
-0+if (err) +break ; + +BT_DBG ("mode 0x%2.2x" , chan->mode); + +break ; +default : err = -ENOPROTOOPT ;break ;
Regards
Marcel
Luiz Augusto von Dentz
maintainerHi Marcel,
Quoted 66 lines · Marcel Holtmann
Hi Luiz,
Quoted 63 lines
This adds
BT_MODEsocket option which can be used to set L2CAP modes, including modes only supported over LE which were not supported using theL2CAP_OPTIONS.Signed-off-by Luiz Augusto von Dentz <[email protected]>---
include/net/bluetooth/bluetooth.h| 8 ++net/bluetooth/l2cap_sock.c| 120 +++++++++++++++++++++++++++++-2 files changed, 127 insertions(+), 1 deletion(-)include/net/bluetooth/bluetooth.h +8
-0@@ -139,6 +139,14 @@ struct bt_voice {#define BT_PHY_LE_CODED_TX 0x00002000#define BT_PHY_LE_CODED_RX 0x00004000 +#define BT_MODE 15 + +#define BT_MODE_BASIC 0x00 +#define BT_MODE_ERTM 0x01 +#define BT_MODE_STREAMING 0x02 +#define BT_MODE_LE_FLOWCTL 0x03 +#define BT_MODE_EXT_FLOWCTL 0x04 + __printf(1, 2)void bt_info (const char *fmt, ...);
__printf(1, 2)net/bluetooth/l2cap_sock.c +18
-0@@ -395,6 +395,24 @@ static int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr,return sizeof (struct sockaddr_l2 ); } +static int l2cap_get_mode (struct l2cap_chan *chan) +{ +switch (chan->mode) { +case L2CAP_MODE_BASIC : +return BT_MODE_BASIC ; +case L2CAP_MODE_ERTM : +return BT_MODE_ERTM ; +case L2CAP_MODE_STREAMING : +return BT_MODE_STREAMING ; +case L2CAP_MODE_LE_FLOWCTL : +return BT_MODE_LE_FLOWCTL ; +case L2CAP_MODE_EXT_FLOWCTL : +return BT_MODE_EXT_FLOWCTL ; + } + +return -EINVAL ; +} +static int l2cap_sock_getsockopt_old (struct socket *sock,int optname,char __user *optval,int __user *optlen) {@@ -424,6 +442,13 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,break ; }
Quoted 9 lines
net/bluetooth/l2cap_sock.c static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, · line 451
Quoted 7 lines
net/bluetooth/l2cap_sock.c +7
-0+/* L2CAP_MODE_LE_FLOWCTL and L2CAP_MODE_EXT_FLOWCTL are not +* supported by L2CAP_OPTIONS. +*/ +if (chan->mode ==L2CAP_MODE_LE_FLOWCTL || + chan->mode ==L2CAP_MODE_EXT_FLOWCTL ) +return -EINVAL ; +I might have done a positive check here.
Right, that means any new mode we introduced is not automatically handled, got it.
Quoted 10 lines
switch (chan->mode) { case L2CAP_MODE_BASIC: case L2CAP_MODE_ERTM: case L2CAP_MODE_STREAMING: break; default: return -EINVAL; }Anyhow, I also realized that in
l2cap_sock_setsockopt_oldwe are allowingL2CAP_MODE_LE_FLOWCTL. I think we want to make that one return EINVAL as well. However that should be a separate patch just in case we need to revert it.
Yep, previously it did not validate the mode being set, which indeed seems to be a bug.
Quoted 1 line
That said, I would leave
L2CAP_MODE_LE_FLOWCTLin here initially and then remove it with the same patch that removes it fromsetsockopt_old. Lets check our userspace first if it handles this all correctly for LE connections (not that L2CAP LE connection oriented channels are used much).
Actually there is a check preventing L2CAP_OPTIONS to work with LE addresses, so applications should not be able to use it in that case, except for BR/EDR though I would consider that to be a bug since L2CAP_MODE_LE_FLOWCTL obviously should not work in that case.
Quoted 131 lines
Quoted 116 lines
net/bluetooth/l2cap_sock.c +87
-1memset (&opts,0 ,sizeof (opts)); opts.imtu = chan->imtu; opts.omtu = chan->omtu;@@ -508,7 +533,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,struct bt_security sec;struct bt_power pwr;u32 phys; -int len, err =0 ; +int len, mode, err =0 ;BT_DBG ("sk %p" , sk);@@ -624,6 +649,27 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, err = -EFAULT ;break ; +case BT_MODE : +if (!enable_ecred) { + err = -ENOPROTOOPT ; +break ; + } + +if (chan->chan_type !=L2CAP_CHAN_CONN_ORIENTED ) { + err = -EINVAL ; +break ; + } + + mode =l2cap_get_mode (chan); +if (mode <0 ) { + err = mode; +break ; + } + +if (put_user (mode, (u8 __user *) optval)) + err = -EFAULT ; +break ; +default : err = -ENOPROTOOPT ;break ;@@ -763,6 +809,45 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,return err; } +static int l2cap_set_mode (struct l2cap_chan *chan,u8 mode) +{ +switch (mode) { +case BT_MODE_BASIC : +if (bdaddr_type_is_le (chan->src_type)) +return -EINVAL ; + mode =L2CAP_MODE_BASIC ; +clear_bit (CONF_STATE2_DEVICE , &chan->conf_state); +break ; +case BT_MODE_ERTM : +if (!disable_ertm ||bdaddr_type_is_le (chan->src_type)) +return -EINVAL ; + mode =L2CAP_MODE_ERTM ; +break ; +case BT_MODE_STREAMING : +if (!disable_ertm ||bdaddr_type_is_le (chan->src_type)) +return -EINVAL ; + mode =L2CAP_MODE_STREAMING ; +break ; +case BT_MODE_LE_FLOWCTL : +if (!bdaddr_type_is_le (chan->src_type)) +return -EINVAL ; + mode =L2CAP_MODE_LE_FLOWCTL ; +break ; +case BT_MODE_EXT_FLOWCTL : +/* TODO: Add support for ECRED PDUs to BR/EDR */ +if (!bdaddr_type_is_le (chan->src_type)) +return -EINVAL ; + mode =L2CAP_MODE_EXT_FLOWCTL ; +break ; +default : +return -EINVAL ; + } + + chan->mode = mode; + +return 0 ; +} +static int l2cap_sock_setsockopt (struct socket *sock,int level,int optname,char __user *optval,unsigned int optlen) {@@ -968,6 +1053,39 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ; +case BT_MODE : +if (!enable_ecred) { + err = -ENOPROTOOPT ; +break ; + } + +BT_DBG ("sk->sk_state %u" , sk->sk_state); + +if (sk->sk_state !=BT_BOUND ) { + err = -EINVAL ; +break ; + } + +if (chan->chan_type !=L2CAP_CHAN_CONN_ORIENTED ) { + err = -EINVAL ; +break ; + } + +if (get_user (opt, (u8 __user *) optval)) { + err = -EFAULT ; +break ; + } + +BT_DBG ("opt %u" , opt); + + err =l2cap_set_mode (chan, opt);net/bluetooth/l2cap_sock.c static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, · line 1091
Quoted 10 lines
net/bluetooth/l2cap_sock.c +7
-0+if (err) +break ; + +BT_DBG ("mode 0x%2.2x" , chan->mode); + +break ; +default : err = -ENOPROTOOPT ;break ;Regards
Marcel
Signature · 1 line
Luiz Augusto von Dentz