Bluetooth: Consolidate code around sk_alloc into a helper function
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v2 1/3 Bluetooth: Consolidate code around sk_alloc into a helper function
From: Luiz Augusto von Dentz <[email protected]>
This consolidates code around sk_alloc into bt_sock_alloc which does take care of common initialization.
--- include/net/bluetooth/bluetooth.h | 2 ++ net/bluetooth/af_bluetooth.c | 21 +++++++++++++++++++++ net/bluetooth/bnep/sock.c | 10 +--------- net/bluetooth/hci_sock.c | 10 ++-------- net/bluetooth/iso.c | 10 +--------- net/bluetooth/l2cap_sock.c | 10 +--------- net/bluetooth/rfcomm/sock.c | 13 +++---------- net/bluetooth/sco.c | 10 +--------- 8 files changed, 32 insertions(+), 54 deletions(-)
include/net/bluetooth/bluetooth.h +2 -0
@@ -400,6 +400,8 @@ int bt_sock_register(int proto, const struct net_proto_family *ops);void bt_sock_unregister (int proto);void bt_sock_link (struct bt_sock_list *l,struct sock *s);void bt_sock_unlink (struct bt_sock_list *l,struct sock *s); +struct sock *bt_sock_alloc (struct net *net,struct socket *sock, +struct proto *prot,int proto,gfp_t prio,int kern);int bt_sock_recvmsg (struct socket *sock,struct msghdr *msg,size_t len,int flags); int bt_sock_stream_recvmsg(struct socket *sock, struct msghdr *msg,
net/bluetooth/af_bluetooth.c +21 -0
@@ -140,6 +140,27 @@ static int bt_sock_create(struct net *net, struct socket *sock, int proto,return err; } +struct sock *bt_sock_alloc (struct net *net,struct socket *sock, +struct proto *prot,int proto,gfp_t prio,int kern) +{ +struct sock *sk; + + sk =sk_alloc (net,PF_BLUETOOTH , prio, prot, kern); +if (!sk) +return NULL ; + +sock_init_data (sock, sk); +INIT_LIST_HEAD (&bt_sk (sk)->accept_q); + +sock_reset_flag (sk,SOCK_ZAPPED ); + + sk->sk_protocol = proto; + sk->sk_state =BT_OPEN ; + +return sk; +} +EXPORT_SYMBOL (bt_sock_alloc); +void bt_sock_link (struct bt_sock_list *l,struct sock *sk) {write_lock (&l->lock);
net/bluetooth/bnep/sock.c +1 -9
@@ -205,21 +205,13 @@ static int bnep_sock_create(struct net *net, struct socket *sock, int protocol,if (sock->type !=SOCK_RAW )return -ESOCKTNOSUPPORT ; - sk =sk_alloc (net,PF_BLUETOOTH ,GFP_ATOMIC , &bnep_proto, kern); + sk =bt_sock_alloc (net, sock, &bnep_proto, protocol,GFP_ATOMIC , kern);if (!sk)return -ENOMEM ; -sock_init_data (sock, sk); - sock->ops = &bnep_sock_ops; - sock->state =SS_UNCONNECTED ; -sock_reset_flag (sk,SOCK_ZAPPED ); - - sk->sk_protocol = protocol; - sk->sk_state =BT_OPEN ; -bt_sock_link (&bnep_sk_list, sk);return 0 ; }
net/bluetooth/hci_sock.c +2 -8
@@ -2143,18 +2143,12 @@ static int hci_sock_create(struct net *net, struct socket *sock, int protocol, sock->ops = &hci_sock_ops; - sk =sk_alloc (net,PF_BLUETOOTH ,GFP_ATOMIC , &hci_sk_proto, kern); + sk =bt_sock_alloc (net, sock, &hci_sk_proto, protocol,GFP_ATOMIC , + kern);if (!sk)return -ENOMEM ; -sock_init_data (sock, sk); - -sock_reset_flag (sk,SOCK_ZAPPED ); - - sk->sk_protocol = protocol; - sock->state =SS_UNCONNECTED ; - sk->sk_state =BT_OPEN ; sk->sk_destruct = hci_sock_destruct;bt_sock_link (&hci_sk_list, sk);
net/bluetooth/iso.c +1 -9
@@ -739,21 +739,13 @@ static struct sock *iso_sock_alloc(struct net *net, struct socket *sock, {struct sock *sk; - sk =sk_alloc (net,PF_BLUETOOTH , prio, &iso_proto, kern); + sk =bt_sock_alloc (net, sock, &iso_proto, proto, prio, kern);if (!sk)return NULL ; -sock_init_data (sock, sk); -INIT_LIST_HEAD (&bt_sk (sk)->accept_q); - sk->sk_destruct = iso_sock_destruct; sk->sk_sndtimeo =ISO_CONN_TIMEOUT ; -sock_reset_flag (sk,SOCK_ZAPPED ); - - sk->sk_protocol = proto; - sk->sk_state =BT_OPEN ; -/* Set address type as public as default src address is BDADDR_ANY */ iso_pi (sk)->src_type =BDADDR_LE_PUBLIC ;
net/bluetooth/l2cap_sock.c +1 -9
@@ -1858,21 +1858,13 @@ static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,struct sock *sk;struct l2cap_chan *chan; - sk =sk_alloc (net,PF_BLUETOOTH , prio, &l2cap_proto, kern); + sk =bt_sock_alloc (net, sock, &l2cap_proto, proto, prio, kern);if (!sk)return NULL ; -sock_init_data (sock, sk); -INIT_LIST_HEAD (&bt_sk (sk)->accept_q); - sk->sk_destruct = l2cap_sock_destruct; sk->sk_sndtimeo =L2CAP_CONN_TIMEOUT ; -sock_reset_flag (sk,SOCK_ZAPPED ); - - sk->sk_protocol = proto; - sk->sk_state =BT_OPEN ; - chan =l2cap_chan_create ();if (!chan) {sk_free (sk);
net/bluetooth/rfcomm/sock.c +3 -10
@@ -268,18 +268,16 @@ static struct proto rfcomm_proto = { .obj_size = sizeof(struct rfcomm_pinfo) }; -static struct sock *rfcomm_sock_alloc (struct net *net,struct socket *sock,int proto,gfp_t prio,int kern) +static struct sock *rfcomm_sock_alloc (struct net *net,struct socket *sock, +int proto,gfp_t prio,int kern) {struct rfcomm_dlc *d;struct sock *sk; - sk =sk_alloc (net,PF_BLUETOOTH , prio, &rfcomm_proto, kern); + sk =bt_sock_alloc (net, sock, &rfcomm_proto, proto, prio, kern);if (!sk)return NULL ; -sock_init_data (sock, sk); -INIT_LIST_HEAD (&bt_sk (sk)->accept_q); - d =rfcomm_dlc_alloc (prio);if (!d) {sk_free (sk);
@@ -298,11 +296,6 @@ static struct sock *rfcomm_sock_alloc(struct net *net, struct socket *sock, int sk->sk_sndbuf =RFCOMM_MAX_CREDITS *RFCOMM_DEFAULT_MTU *10 ; sk->sk_rcvbuf =RFCOMM_MAX_CREDITS *RFCOMM_DEFAULT_MTU *10 ; -sock_reset_flag (sk,SOCK_ZAPPED ); - - sk->sk_protocol = proto; - sk->sk_state =BT_OPEN ; -bt_sock_link (&rfcomm_sk_list, sk);BT_DBG ("sk %p" , sk);
net/bluetooth/sco.c +1 -9
@@ -503,21 +503,13 @@ static struct sock *sco_sock_alloc(struct net *net, struct socket *sock, {struct sock *sk; - sk =sk_alloc (net,PF_BLUETOOTH , prio, &sco_proto, kern); + sk =bt_sock_alloc (net, sock, &sco_proto, proto, prio, kern);if (!sk)return NULL ; -sock_init_data (sock, sk); -INIT_LIST_HEAD (&bt_sk (sk)->accept_q); - sk->sk_destruct = sco_sock_destruct; sk->sk_sndtimeo =SCO_CONN_TIMEOUT ; -sock_reset_flag (sk,SOCK_ZAPPED ); - - sk->sk_protocol = proto; - sk->sk_state =BT_OPEN ; -sco_pi (sk)->setting =BT_VOICE_CVSD_16BIT ;sco_pi (sk)->codec.id =BT_CODEC_CVSD ;sco_pi (sk)->codec.cid =0xffff ;
Signature · 1 line
2.40.1
Luiz Augusto von Dentz
maintainerPATCH v2 2/3 Bluetooth: Init sk_peer_* on bt_sock_alloc
From: Luiz Augusto von Dentz <[email protected]>
This makes sure peer information is always available via sock when using bt_sock_alloc.
--- net/bluetooth/af_bluetooth.c | 14 ++++++++++++++ net/bluetooth/hidp/sock.c | 10 +--------- net/bluetooth/l2cap_sock.c | 19 ------------------- 3 files changed, 15 insertions(+), 28 deletions(-)
net/bluetooth/af_bluetooth.c +14 -0
@@ -157,6 +157,14 @@ struct sock *bt_sock_alloc(struct net *net, struct socket *sock, sk->sk_protocol = proto; sk->sk_state =BT_OPEN ; +/* Init peer information so it can be properly monitored */ +if (!kern) { +spin_lock (&sk->sk_peer_lock); + sk->sk_peer_pid =get_pid (task_tgid (current)); + sk->sk_peer_cred =get_current_cred (); +spin_unlock (&sk->sk_peer_lock); + } +return sk; }EXPORT_SYMBOL (bt_sock_alloc);
@@ -191,6 +199,12 @@ void bt_accept_enqueue(struct sock *parent, struct sock *sk, bool bh)list_add_tail (&bt_sk (sk)->accept_q, &bt_sk (parent)->accept_q);bt_sk (sk)->parent = parent; +/* Copy credentials from parent since for incoming connections the +* socket is allocated by the kernel. +*/ + sk->sk_peer_pid = parent->sk_peer_pid; + sk->sk_peer_cred = parent->sk_peer_cred; +if (bh)bh_unlock_sock (sk);else
net/bluetooth/hidp/sock.c +1 -9
@@ -256,21 +256,13 @@ static int hidp_sock_create(struct net *net, struct socket *sock, int protocol,if (sock->type !=SOCK_RAW )return -ESOCKTNOSUPPORT ; - sk =sk_alloc (net,PF_BLUETOOTH ,GFP_ATOMIC , &hidp_proto, kern); + sk =bt_sock_alloc (net, sock, &hidp_proto, protocol,GFP_ATOMIC , kern);if (!sk)return -ENOMEM ; -sock_init_data (sock, sk); - sock->ops = &hidp_sock_ops; - sock->state =SS_UNCONNECTED ; -sock_reset_flag (sk,SOCK_ZAPPED ); - - sk->sk_protocol = protocol; - sk->sk_state =BT_OPEN ; -bt_sock_link (&hidp_sk_list, sk);return 0 ;
net/bluetooth/l2cap_sock.c +0 -19
@@ -178,21 +178,6 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)return err; } -static void l2cap_sock_init_pid (struct sock *sk) -{ -struct l2cap_chan *chan =l2cap_pi (sk)->chan; - -/* Only L2CAP_MODE_EXT_FLOWCTL ever need to access the PID in order to -* group the channels being requested. -*/ -if (chan->mode !=L2CAP_MODE_EXT_FLOWCTL ) -return ; - -spin_lock (&sk->sk_peer_lock); - sk->sk_peer_pid =get_pid (task_tgid (current)); -spin_unlock (&sk->sk_peer_lock); -} -static int l2cap_sock_connect (struct socket *sock,struct sockaddr *addr,int alen,int flags) {
@@ -268,8 +253,6 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, chan->mode != L2CAP_MODE_EXT_FLOWCTL) chan->mode =L2CAP_MODE_LE_FLOWCTL ; -l2cap_sock_init_pid (sk); - err =l2cap_chan_connect (chan, la.l2_psm,__le16_to_cpu (la.l2_cid), &la.l2_bdaddr, la.l2_bdaddr_type);if (err)
@@ -325,8 +308,6 @@ static int l2cap_sock_listen(struct socket *sock, int backlog) goto done; } -l2cap_sock_init_pid (sk); - sk->sk_max_ack_backlog = backlog; sk->sk_ack_backlog =0 ;
Signature · 1 line
2.40.1
Luiz Augusto von Dentz
maintainerPATCH v2 3/3 Bluetooth: hci_sock: Forward credentials to monitor
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This stores scm_creds into hci_skb_cb so they can be properly forwarded to the likes of btmon which is then able to print information about the process who is originating the traffic:
bluetoothd[35]: @ MGMT Command: Rea.. (0x0001) plen 0 {0x0001}
@ MGMT Event: Command Complete (0x0001) plen 6 {0x0001}
Read Management Version Information (0x0001) plen 3
bluetoothd[35]: < ACL Data T.. flags 0x00 dlen 41
ATT: Write Command (0x52) len 36
Handle: 0x0043 Type: ASE Control Point (0x2bc6)
Data: 020203000110270000022800020a00409c0001000110270000022800020a00409c00
Opcode: QoS Configuration (0x02)
Number of ASE(s): 2
ASE: #0
ASE ID: 0x03
CIG ID: 0x00
CIS ID: 0x01
SDU Interval: 10000 usec
Framing: Unframed (0x00)
PHY: 0x02
LE 2M PHY (0x02)
Max SDU: 40
RTN: 2
Max Transport Latency: 10
Presentation Delay: 40000 us
ASE: #1
ASE ID: 0x01
CIG ID: 0x00
CIS ID: 0x01
SDU Interval: 10000 usec
Framing: Unframed (0x00)
PHY: 0x02
LE 2M PHY (0x02)
Max SDU: 40
RTN: 2
Max Transport Latency: 10
Presentation Delay: 40000 us--- include/net/bluetooth/bluetooth.h | 1 + net/bluetooth/hci_sock.c | 67 ++++++++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 2 deletions(-)
include/net/bluetooth/bluetooth.h +1 -0
@@ -471,6 +471,7 @@ struct bt_skb_cb {struct sco_ctrl sco;struct hci_ctrl hci;struct mgmt_ctrl mgmt; +struct scm_creds creds; }; };#define bt_cb (skb) ((struct bt_skb_cb *)((skb)->cb))
net/bluetooth/hci_sock.c +65 -2
129 lines not on this page · raw message
Signature · 1 line
2.40.1