Phonet: fix race for port number in concurrent bind()
Subsystems (3)
PATCH 1/1 Phonet: fix race for port number in concurrent bind()
From: Rémi Denis-Courmont <[email protected]>
From: Rémi Denis-Courmont <[email protected]>
Allocating a port number to a socket and hashing that socket shall be an atomic operation with regards to other port allocation. Otherwise, we could allocate a port that is already being allocated to another socket.
--- net/phonet/socket.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
net/phonet/socket.c +8 -8
@@ -113,6 +113,8 @@ void pn_sock_unhash(struct sock *sk) }EXPORT_SYMBOL (pn_sock_unhash); +static DEFINE_MUTEX (port_mutex); +static int pn_socket_bind (struct socket *sock,struct sockaddr *addr,int len) {struct sock *sk = sock->sk;
@@ -140,9 +142,11 @@ static int pn_socket_bind(struct socket *sock, struct sockaddr *addr, int len) err = -EINVAL ;/* attempt to rebind */ goto out; } +WARN_ON (sk_hashed (sk)); +mutex_lock (&port_mutex); err = sk->sk_prot->get_port (sk,pn_port (handle));if (err) - goto out; + goto out_port;/* get_port() sets the port, bind() sets the address if applicable */ pn->sobject =pn_object (saddr,pn_port (pn->sobject));
@@ -150,6 +154,8 @@ static int pn_socket_bind(struct socket *sock, struct sockaddr *addr, int len)/* Enable RX on the socket */ sk->sk_prot->hash (sk); +out_port: +mutex_unlock (&port_mutex); out:release_sock (sk);return err;
@@ -357,8 +363,6 @@ const struct proto_ops phonet_stream_ops = { };EXPORT_SYMBOL (phonet_stream_ops); -static DEFINE_MUTEX (port_mutex); -/* allocate port for a socket */ int pn_sock_get_port (struct sock *sk,unsigned short sport) {
@@ -370,9 +374,7 @@ int pn_sock_get_port(struct sock *sk, unsigned short sport)memset (&try_sa,0 ,sizeof (struct sockaddr_pn )); try_sa.spn_family =AF_PHONET ; - -mutex_lock (&port_mutex); - +WARN_ON (!mutex_is_locked (&port_mutex));if (!sport) {/* search free port */ int port, pmin, pmax;
@@ -401,8 +403,6 @@ int pn_sock_get_port(struct sock *sk, unsigned short sport)else sock_put (tmpsk); } -mutex_unlock (&port_mutex); -/* the port must be in use already */ return -EADDRINUSE ;
Signature · 1 line
1.6.0.4
PATCH 1/1 Phonet: error on broadcast sending (unimplemented)
From: Rémi Denis-Courmont <[email protected]>
From: Rémi Denis-Courmont <[email protected]>
If we ever implement this, then we can stop returning an error.
--- include/linux/phonet.h | 1 + net/phonet/af_phonet.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-)
include/linux/phonet.h +1 -0
@@ -38,6 +38,7 @@#define PNPIPE_IFINDEX 2#define PNADDR_ANY 0 +#define PNADDR_BROADCAST 0xFC#define PNPORT_RESOURCE_ROUTING 0/* Values for PNPIPE_ENCAP option */
net/phonet/af_phonet.c +6 -0
@@ -168,6 +168,12 @@ static int pn_send(struct sk_buff *skb, struct net_device *dev, goto drop; } +/* Broadcast sending is not implemented */ +if (pn_addr (dst) ==PNADDR_BROADCAST ) { + err = -EOPNOTSUPP ; + goto drop; + } +skb_reset_transport_header (skb);WARN_ON (skb_headroom (skb) &1 );/* HW assumes word alignment */ skb_push (skb,sizeof (struct phonethdr ));
Signature · 1 line
1.6.0.4
Re: [PATCH] Phonet: error on broadcast sending (unimplemented)
From: Rémi Denis-Courmont <[email protected]>
Date: Wed, 23 Sep 2009 16:17:11 +0300
Quoted 7 lines
From: Rémi Denis-Courmont <[email protected]>
From: Rémi Denis-Courmont <[email protected]>
If we ever implement this, then we can stop returning an error.
Signed-off-by Rémi Denis-Courmont <[email protected]>
Applied.
From: Rémi Denis-Courmont <[email protected]>
Date: Wed, 23 Sep 2009 16:17:10 +0300
Quoted 10 lines
From: Rémi Denis-Courmont <[email protected]>
From: Rémi Denis-Courmont <[email protected]>
Allocating a port number to a socket and hashing that socket shall be an atomic operation with regards to other port allocation. Otherwise, we could allocate a port that is already being allocated to another socket.
Signed-off-by Rémi Denis-Courmont <[email protected]>
Applied.