2008-09-23 11:05:19 +08:00
|
|
|
/*
|
|
|
|
* File: socket.c
|
|
|
|
*
|
|
|
|
* Phonet sockets
|
|
|
|
*
|
|
|
|
* Copyright (C) 2008 Nokia Corporation.
|
|
|
|
*
|
2012-06-14 06:29:03 +08:00
|
|
|
* Authors: Sakari Ailus <sakari.ailus@nokia.com>
|
|
|
|
* Rémi Denis-Courmont
|
2008-09-23 11:05:19 +08:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* version 2 as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
|
|
|
* 02110-1301 USA
|
|
|
|
*/
|
|
|
|
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/gfp.h>
|
2008-09-23 11:05:19 +08:00
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/net.h>
|
2008-10-06 02:14:48 +08:00
|
|
|
#include <linux/poll.h>
|
2008-09-23 11:05:19 +08:00
|
|
|
#include <net/sock.h>
|
|
|
|
#include <net/tcp_states.h>
|
|
|
|
|
|
|
|
#include <linux/phonet.h>
|
2011-07-15 23:47:34 +08:00
|
|
|
#include <linux/export.h>
|
2008-09-23 11:05:19 +08:00
|
|
|
#include <net/phonet/phonet.h>
|
2008-10-06 02:14:48 +08:00
|
|
|
#include <net/phonet/pep.h>
|
2008-09-23 11:05:19 +08:00
|
|
|
#include <net/phonet/pn_dev.h>
|
|
|
|
|
|
|
|
static int pn_socket_release(struct socket *sock)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
|
|
|
|
if (sk) {
|
|
|
|
sock->sk = NULL;
|
|
|
|
sk->sk_prot->close(sk, 0);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-11-09 10:17:01 +08:00
|
|
|
#define PN_HASHSIZE 16
|
|
|
|
#define PN_HASHMASK (PN_HASHSIZE-1)
|
|
|
|
|
|
|
|
|
2008-09-23 11:05:19 +08:00
|
|
|
static struct {
|
2009-11-09 10:17:01 +08:00
|
|
|
struct hlist_head hlist[PN_HASHSIZE];
|
2011-04-13 07:27:36 +08:00
|
|
|
struct mutex lock;
|
2009-11-09 10:17:01 +08:00
|
|
|
} pnsocks;
|
|
|
|
|
|
|
|
void __init pn_sock_init(void)
|
|
|
|
{
|
2012-04-15 13:58:06 +08:00
|
|
|
unsigned int i;
|
2009-11-09 10:17:01 +08:00
|
|
|
|
|
|
|
for (i = 0; i < PN_HASHSIZE; i++)
|
|
|
|
INIT_HLIST_HEAD(pnsocks.hlist + i);
|
2011-04-13 07:27:36 +08:00
|
|
|
mutex_init(&pnsocks.lock);
|
2009-11-09 10:17:01 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct hlist_head *pn_hash_list(u16 obj)
|
|
|
|
{
|
|
|
|
return pnsocks.hlist + (obj & PN_HASHMASK);
|
|
|
|
}
|
2008-09-23 11:05:19 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Find address based on socket address, match only certain fields.
|
|
|
|
* Also grab sock if it was found. Remember to sock_put it later.
|
|
|
|
*/
|
2008-12-04 07:42:56 +08:00
|
|
|
struct sock *pn_find_sock_by_sa(struct net *net, const struct sockaddr_pn *spn)
|
2008-09-23 11:05:19 +08:00
|
|
|
{
|
|
|
|
struct sock *sknode;
|
|
|
|
struct sock *rval = NULL;
|
|
|
|
u16 obj = pn_sockaddr_get_object(spn);
|
|
|
|
u8 res = spn->spn_resource;
|
2009-11-09 10:17:01 +08:00
|
|
|
struct hlist_head *hlist = pn_hash_list(obj);
|
2008-09-23 11:05:19 +08:00
|
|
|
|
2011-04-13 07:27:36 +08:00
|
|
|
rcu_read_lock();
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
sk_for_each_rcu(sknode, hlist) {
|
2008-09-23 11:05:19 +08:00
|
|
|
struct pn_sock *pn = pn_sk(sknode);
|
|
|
|
BUG_ON(!pn->sobject); /* unbound socket */
|
|
|
|
|
2008-12-04 07:42:56 +08:00
|
|
|
if (!net_eq(sock_net(sknode), net))
|
|
|
|
continue;
|
2008-09-23 11:05:19 +08:00
|
|
|
if (pn_port(obj)) {
|
|
|
|
/* Look up socket by port */
|
|
|
|
if (pn_port(pn->sobject) != pn_port(obj))
|
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
/* If port is zero, look up by resource */
|
|
|
|
if (pn->resource != res)
|
|
|
|
continue;
|
|
|
|
}
|
2009-11-30 08:55:45 +08:00
|
|
|
if (pn_addr(pn->sobject) &&
|
|
|
|
pn_addr(pn->sobject) != pn_addr(obj))
|
2008-09-23 11:05:19 +08:00
|
|
|
continue;
|
|
|
|
|
|
|
|
rval = sknode;
|
|
|
|
sock_hold(sknode);
|
|
|
|
break;
|
|
|
|
}
|
2011-04-13 07:27:36 +08:00
|
|
|
rcu_read_unlock();
|
2008-09-23 11:05:19 +08:00
|
|
|
|
|
|
|
return rval;
|
2009-10-14 08:48:27 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Deliver a broadcast packet (only in bottom-half) */
|
|
|
|
void pn_deliver_sock_broadcast(struct net *net, struct sk_buff *skb)
|
|
|
|
{
|
2009-11-09 10:17:01 +08:00
|
|
|
struct hlist_head *hlist = pnsocks.hlist;
|
2012-04-15 13:58:06 +08:00
|
|
|
unsigned int h;
|
2009-10-14 08:48:27 +08:00
|
|
|
|
2011-04-13 07:27:36 +08:00
|
|
|
rcu_read_lock();
|
2009-11-09 10:17:01 +08:00
|
|
|
for (h = 0; h < PN_HASHSIZE; h++) {
|
|
|
|
struct sock *sknode;
|
2009-10-14 08:48:27 +08:00
|
|
|
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
sk_for_each(sknode, hlist) {
|
2009-11-09 10:17:01 +08:00
|
|
|
struct sk_buff *clone;
|
2008-09-23 11:05:19 +08:00
|
|
|
|
2009-11-09 10:17:01 +08:00
|
|
|
if (!net_eq(sock_net(sknode), net))
|
|
|
|
continue;
|
|
|
|
if (!sock_flag(sknode, SOCK_BROADCAST))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
clone = skb_clone(skb, GFP_ATOMIC);
|
|
|
|
if (clone) {
|
|
|
|
sock_hold(sknode);
|
|
|
|
sk_receive_skb(sknode, clone, 0);
|
|
|
|
}
|
2009-10-16 03:29:14 +08:00
|
|
|
}
|
2009-11-09 10:17:01 +08:00
|
|
|
hlist++;
|
2009-10-14 08:48:27 +08:00
|
|
|
}
|
2011-04-13 07:27:36 +08:00
|
|
|
rcu_read_unlock();
|
2008-09-23 11:05:19 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void pn_sock_hash(struct sock *sk)
|
|
|
|
{
|
2009-11-09 10:17:01 +08:00
|
|
|
struct hlist_head *hlist = pn_hash_list(pn_sk(sk)->sobject);
|
|
|
|
|
2011-04-13 07:27:36 +08:00
|
|
|
mutex_lock(&pnsocks.lock);
|
|
|
|
sk_add_node_rcu(sk, hlist);
|
|
|
|
mutex_unlock(&pnsocks.lock);
|
2008-09-23 11:05:19 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(pn_sock_hash);
|
|
|
|
|
|
|
|
void pn_sock_unhash(struct sock *sk)
|
|
|
|
{
|
2011-04-13 07:27:36 +08:00
|
|
|
mutex_lock(&pnsocks.lock);
|
|
|
|
sk_del_node_init_rcu(sk);
|
|
|
|
mutex_unlock(&pnsocks.lock);
|
2010-09-15 20:30:12 +08:00
|
|
|
pn_sock_unbind_all_res(sk);
|
2011-04-13 07:27:36 +08:00
|
|
|
synchronize_rcu();
|
2008-09-23 11:05:19 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(pn_sock_unhash);
|
|
|
|
|
2009-09-23 11:17:10 +08:00
|
|
|
static DEFINE_MUTEX(port_mutex);
|
|
|
|
|
2008-09-23 11:05:19 +08:00
|
|
|
static int pn_socket_bind(struct socket *sock, struct sockaddr *addr, int len)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
struct pn_sock *pn = pn_sk(sk);
|
|
|
|
struct sockaddr_pn *spn = (struct sockaddr_pn *)addr;
|
|
|
|
int err;
|
|
|
|
u16 handle;
|
|
|
|
u8 saddr;
|
|
|
|
|
|
|
|
if (sk->sk_prot->bind)
|
|
|
|
return sk->sk_prot->bind(sk, addr, len);
|
|
|
|
|
|
|
|
if (len < sizeof(struct sockaddr_pn))
|
|
|
|
return -EINVAL;
|
|
|
|
if (spn->spn_family != AF_PHONET)
|
|
|
|
return -EAFNOSUPPORT;
|
|
|
|
|
|
|
|
handle = pn_sockaddr_get_object((struct sockaddr_pn *)addr);
|
|
|
|
saddr = pn_addr(handle);
|
2008-12-04 07:42:56 +08:00
|
|
|
if (saddr && phonet_address_lookup(sock_net(sk), saddr))
|
2008-09-23 11:05:19 +08:00
|
|
|
return -EADDRNOTAVAIL;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
if (sk->sk_state != TCP_CLOSE || pn_port(pn->sobject)) {
|
|
|
|
err = -EINVAL; /* attempt to rebind */
|
|
|
|
goto out;
|
|
|
|
}
|
2009-09-23 11:17:10 +08:00
|
|
|
WARN_ON(sk_hashed(sk));
|
|
|
|
mutex_lock(&port_mutex);
|
2008-09-23 11:05:19 +08:00
|
|
|
err = sk->sk_prot->get_port(sk, pn_port(handle));
|
|
|
|
if (err)
|
2009-09-23 11:17:10 +08:00
|
|
|
goto out_port;
|
2008-09-23 11:05:19 +08:00
|
|
|
|
|
|
|
/* get_port() sets the port, bind() sets the address if applicable */
|
|
|
|
pn->sobject = pn_object(saddr, pn_port(pn->sobject));
|
|
|
|
pn->resource = spn->spn_resource;
|
|
|
|
|
|
|
|
/* Enable RX on the socket */
|
|
|
|
sk->sk_prot->hash(sk);
|
2009-09-23 11:17:10 +08:00
|
|
|
out_port:
|
|
|
|
mutex_unlock(&port_mutex);
|
2008-09-23 11:05:19 +08:00
|
|
|
out:
|
|
|
|
release_sock(sk);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int pn_socket_autobind(struct socket *sock)
|
|
|
|
{
|
|
|
|
struct sockaddr_pn sa;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
memset(&sa, 0, sizeof(sa));
|
|
|
|
sa.spn_family = AF_PHONET;
|
|
|
|
err = pn_socket_bind(sock, (struct sockaddr *)&sa,
|
|
|
|
sizeof(struct sockaddr_pn));
|
|
|
|
if (err != -EINVAL)
|
|
|
|
return err;
|
|
|
|
BUG_ON(!pn_port(pn_sk(sock->sk)->sobject));
|
|
|
|
return 0; /* socket was already bound */
|
|
|
|
}
|
|
|
|
|
2010-10-13 04:14:43 +08:00
|
|
|
static int pn_socket_connect(struct socket *sock, struct sockaddr *addr,
|
|
|
|
int len, int flags)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
2011-03-09 06:44:12 +08:00
|
|
|
struct pn_sock *pn = pn_sk(sk);
|
2010-10-13 04:14:43 +08:00
|
|
|
struct sockaddr_pn *spn = (struct sockaddr_pn *)addr;
|
2011-03-09 06:44:12 +08:00
|
|
|
struct task_struct *tsk = current;
|
|
|
|
long timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);
|
2010-10-13 04:14:43 +08:00
|
|
|
int err;
|
|
|
|
|
2011-03-09 06:44:12 +08:00
|
|
|
if (pn_socket_autobind(sock))
|
|
|
|
return -ENOBUFS;
|
2010-10-13 04:14:43 +08:00
|
|
|
if (len < sizeof(struct sockaddr_pn))
|
|
|
|
return -EINVAL;
|
|
|
|
if (spn->spn_family != AF_PHONET)
|
|
|
|
return -EAFNOSUPPORT;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
|
|
|
|
switch (sock->state) {
|
|
|
|
case SS_UNCONNECTED:
|
2011-03-09 06:44:12 +08:00
|
|
|
if (sk->sk_state != TCP_CLOSE) {
|
2010-10-13 04:14:43 +08:00
|
|
|
err = -EISCONN;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
break;
|
2011-03-09 06:44:12 +08:00
|
|
|
case SS_CONNECTING:
|
|
|
|
err = -EALREADY;
|
|
|
|
goto out;
|
|
|
|
default:
|
|
|
|
err = -EISCONN;
|
|
|
|
goto out;
|
2010-10-13 04:14:43 +08:00
|
|
|
}
|
|
|
|
|
2011-03-09 06:44:12 +08:00
|
|
|
pn->dobject = pn_sockaddr_get_object(spn);
|
|
|
|
pn->resource = pn_sockaddr_get_resource(spn);
|
2010-10-13 04:14:43 +08:00
|
|
|
sock->state = SS_CONNECTING;
|
2011-03-09 06:44:12 +08:00
|
|
|
|
2010-10-13 04:14:43 +08:00
|
|
|
err = sk->sk_prot->connect(sk, addr, len);
|
2011-03-09 06:44:12 +08:00
|
|
|
if (err) {
|
2010-10-13 04:14:43 +08:00
|
|
|
sock->state = SS_UNCONNECTED;
|
2011-03-09 06:44:12 +08:00
|
|
|
pn->dobject = 0;
|
2010-10-13 04:14:43 +08:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2011-03-09 06:44:12 +08:00
|
|
|
while (sk->sk_state == TCP_SYN_SENT) {
|
|
|
|
DEFINE_WAIT(wait);
|
2010-10-13 04:14:43 +08:00
|
|
|
|
2011-03-09 06:44:12 +08:00
|
|
|
if (!timeo) {
|
|
|
|
err = -EINPROGRESS;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (signal_pending(tsk)) {
|
|
|
|
err = sock_intr_errno(timeo);
|
|
|
|
goto out;
|
|
|
|
}
|
2010-10-13 04:14:43 +08:00
|
|
|
|
2011-03-09 06:44:12 +08:00
|
|
|
prepare_to_wait_exclusive(sk_sleep(sk), &wait,
|
|
|
|
TASK_INTERRUPTIBLE);
|
|
|
|
release_sock(sk);
|
|
|
|
timeo = schedule_timeout(timeo);
|
|
|
|
lock_sock(sk);
|
|
|
|
finish_wait(sk_sleep(sk), &wait);
|
2010-10-13 04:14:43 +08:00
|
|
|
}
|
|
|
|
|
2011-03-09 06:44:12 +08:00
|
|
|
if ((1 << sk->sk_state) & (TCPF_SYN_RECV|TCPF_ESTABLISHED))
|
|
|
|
err = 0;
|
|
|
|
else if (sk->sk_state == TCP_CLOSE_WAIT)
|
|
|
|
err = -ECONNRESET;
|
|
|
|
else
|
|
|
|
err = -ECONNREFUSED;
|
|
|
|
sock->state = err ? SS_UNCONNECTED : SS_CONNECTED;
|
2010-10-13 04:14:43 +08:00
|
|
|
out:
|
|
|
|
release_sock(sk);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2008-10-06 02:14:48 +08:00
|
|
|
static int pn_socket_accept(struct socket *sock, struct socket *newsock,
|
|
|
|
int flags)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
struct sock *newsk;
|
|
|
|
int err;
|
|
|
|
|
2011-03-09 06:44:10 +08:00
|
|
|
if (unlikely(sk->sk_state != TCP_LISTEN))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2008-10-06 02:14:48 +08:00
|
|
|
newsk = sk->sk_prot->accept(sk, flags, &err);
|
|
|
|
if (!newsk)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
lock_sock(newsk);
|
|
|
|
sock_graft(newsk, newsock);
|
|
|
|
newsock->state = SS_CONNECTED;
|
|
|
|
release_sock(newsk);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-23 11:05:19 +08:00
|
|
|
static int pn_socket_getname(struct socket *sock, struct sockaddr *addr,
|
|
|
|
int *sockaddr_len, int peer)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
struct pn_sock *pn = pn_sk(sk);
|
|
|
|
|
|
|
|
memset(addr, 0, sizeof(struct sockaddr_pn));
|
|
|
|
addr->sa_family = AF_PHONET;
|
|
|
|
if (!peer) /* Race with bind() here is userland's problem. */
|
|
|
|
pn_sockaddr_set_object((struct sockaddr_pn *)addr,
|
|
|
|
pn->sobject);
|
|
|
|
|
|
|
|
*sockaddr_len = sizeof(struct sockaddr_pn);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-10-06 02:14:48 +08:00
|
|
|
static unsigned int pn_socket_poll(struct file *file, struct socket *sock,
|
|
|
|
poll_table *wait)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
struct pep_sock *pn = pep_sk(sk);
|
|
|
|
unsigned int mask = 0;
|
|
|
|
|
2010-04-29 19:01:49 +08:00
|
|
|
poll_wait(file, sk_sleep(sk), wait);
|
2008-10-06 02:14:48 +08:00
|
|
|
|
2011-03-09 06:44:10 +08:00
|
|
|
if (sk->sk_state == TCP_CLOSE)
|
2008-10-06 02:14:48 +08:00
|
|
|
return POLLERR;
|
|
|
|
if (!skb_queue_empty(&sk->sk_receive_queue))
|
|
|
|
mask |= POLLIN | POLLRDNORM;
|
2008-10-06 02:15:43 +08:00
|
|
|
if (!skb_queue_empty(&pn->ctrlreq_queue))
|
|
|
|
mask |= POLLPRI;
|
|
|
|
if (!mask && sk->sk_state == TCP_CLOSE_WAIT)
|
2008-10-06 02:14:48 +08:00
|
|
|
return POLLHUP;
|
|
|
|
|
2010-08-30 20:57:05 +08:00
|
|
|
if (sk->sk_state == TCP_ESTABLISHED &&
|
|
|
|
atomic_read(&sk->sk_wmem_alloc) < sk->sk_sndbuf &&
|
|
|
|
atomic_read(&pn->tx_credits))
|
2008-10-06 02:14:48 +08:00
|
|
|
mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
|
|
|
|
|
|
|
|
return mask;
|
|
|
|
}
|
|
|
|
|
2008-09-23 11:05:19 +08:00
|
|
|
static int pn_socket_ioctl(struct socket *sock, unsigned int cmd,
|
|
|
|
unsigned long arg)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
struct pn_sock *pn = pn_sk(sk);
|
|
|
|
|
|
|
|
if (cmd == SIOCPNGETOBJECT) {
|
|
|
|
struct net_device *dev;
|
|
|
|
u16 handle;
|
|
|
|
u8 saddr;
|
|
|
|
|
|
|
|
if (get_user(handle, (__u16 __user *)arg))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
if (sk->sk_bound_dev_if)
|
|
|
|
dev = dev_get_by_index(sock_net(sk),
|
|
|
|
sk->sk_bound_dev_if);
|
|
|
|
else
|
|
|
|
dev = phonet_device_get(sock_net(sk));
|
|
|
|
if (dev && (dev->flags & IFF_UP))
|
|
|
|
saddr = phonet_address_get(dev, pn_addr(handle));
|
|
|
|
else
|
|
|
|
saddr = PN_NO_ADDR;
|
|
|
|
release_sock(sk);
|
|
|
|
|
|
|
|
if (dev)
|
|
|
|
dev_put(dev);
|
|
|
|
if (saddr == PN_NO_ADDR)
|
|
|
|
return -EHOSTUNREACH;
|
|
|
|
|
|
|
|
handle = pn_object(saddr, pn_port(pn->sobject));
|
|
|
|
return put_user(handle, (__u16 __user *)arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
return sk->sk_prot->ioctl(sk, cmd, arg);
|
|
|
|
}
|
|
|
|
|
2008-10-06 02:14:48 +08:00
|
|
|
static int pn_socket_listen(struct socket *sock, int backlog)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
if (pn_socket_autobind(sock))
|
|
|
|
return -ENOBUFS;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
2011-02-25 07:14:56 +08:00
|
|
|
if (sock->state != SS_UNCONNECTED) {
|
2008-10-06 02:14:48 +08:00
|
|
|
err = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2011-02-25 07:14:56 +08:00
|
|
|
if (sk->sk_state != TCP_LISTEN) {
|
|
|
|
sk->sk_state = TCP_LISTEN;
|
|
|
|
sk->sk_ack_backlog = 0;
|
|
|
|
}
|
2008-10-06 02:14:48 +08:00
|
|
|
sk->sk_max_ack_backlog = backlog;
|
|
|
|
out:
|
|
|
|
release_sock(sk);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2008-09-23 11:05:19 +08:00
|
|
|
static int pn_socket_sendmsg(struct kiocb *iocb, struct socket *sock,
|
|
|
|
struct msghdr *m, size_t total_len)
|
|
|
|
{
|
|
|
|
struct sock *sk = sock->sk;
|
|
|
|
|
|
|
|
if (pn_socket_autobind(sock))
|
|
|
|
return -EAGAIN;
|
|
|
|
|
|
|
|
return sk->sk_prot->sendmsg(iocb, sk, m, total_len);
|
|
|
|
}
|
|
|
|
|
|
|
|
const struct proto_ops phonet_dgram_ops = {
|
|
|
|
.family = AF_PHONET,
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.release = pn_socket_release,
|
|
|
|
.bind = pn_socket_bind,
|
|
|
|
.connect = sock_no_connect,
|
|
|
|
.socketpair = sock_no_socketpair,
|
|
|
|
.accept = sock_no_accept,
|
|
|
|
.getname = pn_socket_getname,
|
|
|
|
.poll = datagram_poll,
|
|
|
|
.ioctl = pn_socket_ioctl,
|
|
|
|
.listen = sock_no_listen,
|
|
|
|
.shutdown = sock_no_shutdown,
|
|
|
|
.setsockopt = sock_no_setsockopt,
|
|
|
|
.getsockopt = sock_no_getsockopt,
|
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
|
.compat_setsockopt = sock_no_setsockopt,
|
|
|
|
.compat_getsockopt = sock_no_getsockopt,
|
|
|
|
#endif
|
|
|
|
.sendmsg = pn_socket_sendmsg,
|
|
|
|
.recvmsg = sock_common_recvmsg,
|
|
|
|
.mmap = sock_no_mmap,
|
|
|
|
.sendpage = sock_no_sendpage,
|
|
|
|
};
|
|
|
|
|
2008-10-06 02:14:48 +08:00
|
|
|
const struct proto_ops phonet_stream_ops = {
|
|
|
|
.family = AF_PHONET,
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.release = pn_socket_release,
|
|
|
|
.bind = pn_socket_bind,
|
2010-10-13 04:14:43 +08:00
|
|
|
.connect = pn_socket_connect,
|
2008-10-06 02:14:48 +08:00
|
|
|
.socketpair = sock_no_socketpair,
|
|
|
|
.accept = pn_socket_accept,
|
|
|
|
.getname = pn_socket_getname,
|
|
|
|
.poll = pn_socket_poll,
|
|
|
|
.ioctl = pn_socket_ioctl,
|
|
|
|
.listen = pn_socket_listen,
|
|
|
|
.shutdown = sock_no_shutdown,
|
2008-10-06 02:16:16 +08:00
|
|
|
.setsockopt = sock_common_setsockopt,
|
|
|
|
.getsockopt = sock_common_getsockopt,
|
2008-10-06 02:14:48 +08:00
|
|
|
#ifdef CONFIG_COMPAT
|
2008-10-06 02:16:16 +08:00
|
|
|
.compat_setsockopt = compat_sock_common_setsockopt,
|
|
|
|
.compat_getsockopt = compat_sock_common_getsockopt,
|
2008-10-06 02:14:48 +08:00
|
|
|
#endif
|
|
|
|
.sendmsg = pn_socket_sendmsg,
|
|
|
|
.recvmsg = sock_common_recvmsg,
|
|
|
|
.mmap = sock_no_mmap,
|
|
|
|
.sendpage = sock_no_sendpage,
|
|
|
|
};
|
|
|
|
EXPORT_SYMBOL(phonet_stream_ops);
|
|
|
|
|
2008-09-23 11:05:19 +08:00
|
|
|
/* allocate port for a socket */
|
|
|
|
int pn_sock_get_port(struct sock *sk, unsigned short sport)
|
|
|
|
{
|
|
|
|
static int port_cur;
|
2008-12-04 07:42:56 +08:00
|
|
|
struct net *net = sock_net(sk);
|
2008-09-23 11:05:19 +08:00
|
|
|
struct pn_sock *pn = pn_sk(sk);
|
|
|
|
struct sockaddr_pn try_sa;
|
|
|
|
struct sock *tmpsk;
|
|
|
|
|
|
|
|
memset(&try_sa, 0, sizeof(struct sockaddr_pn));
|
|
|
|
try_sa.spn_family = AF_PHONET;
|
2009-09-23 11:17:10 +08:00
|
|
|
WARN_ON(!mutex_is_locked(&port_mutex));
|
2008-09-23 11:05:19 +08:00
|
|
|
if (!sport) {
|
|
|
|
/* search free port */
|
2008-09-23 11:08:39 +08:00
|
|
|
int port, pmin, pmax;
|
2008-09-23 11:05:19 +08:00
|
|
|
|
2008-09-23 11:08:39 +08:00
|
|
|
phonet_get_local_port_range(&pmin, &pmax);
|
2008-09-23 11:05:19 +08:00
|
|
|
for (port = pmin; port <= pmax; port++) {
|
|
|
|
port_cur++;
|
|
|
|
if (port_cur < pmin || port_cur > pmax)
|
|
|
|
port_cur = pmin;
|
|
|
|
|
|
|
|
pn_sockaddr_set_port(&try_sa, port_cur);
|
2008-12-04 07:42:56 +08:00
|
|
|
tmpsk = pn_find_sock_by_sa(net, &try_sa);
|
2008-09-23 11:05:19 +08:00
|
|
|
if (tmpsk == NULL) {
|
|
|
|
sport = port_cur;
|
|
|
|
goto found;
|
|
|
|
} else
|
|
|
|
sock_put(tmpsk);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* try to find specific port */
|
|
|
|
pn_sockaddr_set_port(&try_sa, sport);
|
2008-12-04 07:42:56 +08:00
|
|
|
tmpsk = pn_find_sock_by_sa(net, &try_sa);
|
2008-09-23 11:05:19 +08:00
|
|
|
if (tmpsk == NULL)
|
|
|
|
/* No sock there! We can use that port... */
|
|
|
|
goto found;
|
|
|
|
else
|
|
|
|
sock_put(tmpsk);
|
|
|
|
}
|
|
|
|
/* the port must be in use already */
|
|
|
|
return -EADDRINUSE;
|
|
|
|
|
|
|
|
found:
|
|
|
|
pn->sobject = pn_object(pn_addr(pn->sobject), sport);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(pn_sock_get_port);
|
2009-07-21 09:57:57 +08:00
|
|
|
|
2009-08-17 18:35:49 +08:00
|
|
|
#ifdef CONFIG_PROC_FS
|
2009-07-21 09:57:57 +08:00
|
|
|
static struct sock *pn_sock_get_idx(struct seq_file *seq, loff_t pos)
|
|
|
|
{
|
|
|
|
struct net *net = seq_file_net(seq);
|
2009-11-09 10:17:01 +08:00
|
|
|
struct hlist_head *hlist = pnsocks.hlist;
|
2009-07-21 09:57:57 +08:00
|
|
|
struct sock *sknode;
|
2012-04-15 13:58:06 +08:00
|
|
|
unsigned int h;
|
2009-07-21 09:57:57 +08:00
|
|
|
|
2009-11-09 10:17:01 +08:00
|
|
|
for (h = 0; h < PN_HASHSIZE; h++) {
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
sk_for_each_rcu(sknode, hlist) {
|
2009-11-09 10:17:01 +08:00
|
|
|
if (!net_eq(net, sock_net(sknode)))
|
|
|
|
continue;
|
|
|
|
if (!pos)
|
|
|
|
return sknode;
|
|
|
|
pos--;
|
|
|
|
}
|
|
|
|
hlist++;
|
2009-07-21 09:57:57 +08:00
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct sock *pn_sock_get_next(struct seq_file *seq, struct sock *sk)
|
|
|
|
{
|
|
|
|
struct net *net = seq_file_net(seq);
|
|
|
|
|
|
|
|
do
|
|
|
|
sk = sk_next(sk);
|
|
|
|
while (sk && !net_eq(net, sock_net(sk)));
|
|
|
|
|
|
|
|
return sk;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *pn_sock_seq_start(struct seq_file *seq, loff_t *pos)
|
2011-04-13 07:27:36 +08:00
|
|
|
__acquires(rcu)
|
2009-07-21 09:57:57 +08:00
|
|
|
{
|
2011-04-13 07:27:36 +08:00
|
|
|
rcu_read_lock();
|
2009-07-21 09:57:57 +08:00
|
|
|
return *pos ? pn_sock_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *pn_sock_seq_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
|
|
{
|
|
|
|
struct sock *sk;
|
|
|
|
|
|
|
|
if (v == SEQ_START_TOKEN)
|
|
|
|
sk = pn_sock_get_idx(seq, 0);
|
|
|
|
else
|
|
|
|
sk = pn_sock_get_next(seq, v);
|
|
|
|
(*pos)++;
|
|
|
|
return sk;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void pn_sock_seq_stop(struct seq_file *seq, void *v)
|
2011-04-13 07:27:36 +08:00
|
|
|
__releases(rcu)
|
2009-07-21 09:57:57 +08:00
|
|
|
{
|
2011-04-13 07:27:36 +08:00
|
|
|
rcu_read_unlock();
|
2009-07-21 09:57:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int pn_sock_seq_show(struct seq_file *seq, void *v)
|
|
|
|
{
|
|
|
|
int len;
|
|
|
|
|
|
|
|
if (v == SEQ_START_TOKEN)
|
|
|
|
seq_printf(seq, "%s%n", "pt loc rem rs st tx_queue rx_queue "
|
|
|
|
" uid inode ref pointer drops", &len);
|
|
|
|
else {
|
|
|
|
struct sock *sk = v;
|
|
|
|
struct pn_sock *pn = pn_sk(sk);
|
|
|
|
|
|
|
|
seq_printf(seq, "%2d %04X:%04X:%02X %02X %08X:%08X %5d %lu "
|
net: convert %p usage to %pK
The %pK format specifier is designed to hide exposed kernel pointers,
specifically via /proc interfaces. Exposing these pointers provides an
easy target for kernel write vulnerabilities, since they reveal the
locations of writable structures containing easily triggerable function
pointers. The behavior of %pK depends on the kptr_restrict sysctl.
If kptr_restrict is set to 0, no deviation from the standard %p behavior
occurs. If kptr_restrict is set to 1, the default, if the current user
(intended to be a reader via seq_printf(), etc.) does not have CAP_SYSLOG
(currently in the LSM tree), kernel pointers using %pK are printed as 0's.
If kptr_restrict is set to 2, kernel pointers using %pK are printed as
0's regardless of privileges. Replacing with 0's was chosen over the
default "(null)", which cannot be parsed by userland %p, which expects
"(nil)".
The supporting code for kptr_restrict and %pK are currently in the -mm
tree. This patch converts users of %p in net/ to %pK. Cases of printing
pointers to the syslog are not covered, since this would eliminate useful
information for postmortem debugging and the reading of the syslog is
already optionally protected by the dmesg_restrict sysctl.
Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com>
Cc: James Morris <jmorris@namei.org>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Thomas Graf <tgraf@infradead.org>
Cc: Eugene Teo <eugeneteo@kernel.org>
Cc: Kees Cook <kees.cook@canonical.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: David S. Miller <davem@davemloft.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Eric Paris <eparis@parisplace.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2011-05-23 20:17:35 +08:00
|
|
|
"%d %pK %d%n",
|
2011-02-25 07:14:57 +08:00
|
|
|
sk->sk_protocol, pn->sobject, pn->dobject,
|
|
|
|
pn->resource, sk->sk_state,
|
2009-07-21 09:57:57 +08:00
|
|
|
sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
|
2012-05-24 15:10:10 +08:00
|
|
|
from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)),
|
|
|
|
sock_i_ino(sk),
|
2009-07-21 09:57:57 +08:00
|
|
|
atomic_read(&sk->sk_refcnt), sk,
|
|
|
|
atomic_read(&sk->sk_drops), &len);
|
|
|
|
}
|
|
|
|
seq_printf(seq, "%*s\n", 127 - len, "");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct seq_operations pn_sock_seq_ops = {
|
|
|
|
.start = pn_sock_seq_start,
|
|
|
|
.next = pn_sock_seq_next,
|
|
|
|
.stop = pn_sock_seq_stop,
|
|
|
|
.show = pn_sock_seq_show,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int pn_sock_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
2009-08-11 11:12:07 +08:00
|
|
|
return seq_open_net(inode, file, &pn_sock_seq_ops,
|
|
|
|
sizeof(struct seq_net_private));
|
2009-07-21 09:57:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
const struct file_operations pn_sock_seq_fops = {
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.open = pn_sock_open,
|
|
|
|
.read = seq_read,
|
|
|
|
.llseek = seq_lseek,
|
2009-08-11 11:12:07 +08:00
|
|
|
.release = seq_release_net,
|
2009-07-21 09:57:57 +08:00
|
|
|
};
|
2009-08-17 18:35:49 +08:00
|
|
|
#endif
|
2010-09-15 20:30:11 +08:00
|
|
|
|
|
|
|
static struct {
|
|
|
|
struct sock *sk[256];
|
|
|
|
} pnres;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Find and hold socket based on resource.
|
|
|
|
*/
|
|
|
|
struct sock *pn_find_sock_by_res(struct net *net, u8 res)
|
|
|
|
{
|
|
|
|
struct sock *sk;
|
|
|
|
|
|
|
|
if (!net_eq(net, &init_net))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
sk = rcu_dereference(pnres.sk[res]);
|
|
|
|
if (sk)
|
|
|
|
sock_hold(sk);
|
|
|
|
rcu_read_unlock();
|
|
|
|
return sk;
|
|
|
|
}
|
|
|
|
|
|
|
|
static DEFINE_MUTEX(resource_mutex);
|
|
|
|
|
|
|
|
int pn_sock_bind_res(struct sock *sk, u8 res)
|
|
|
|
{
|
|
|
|
int ret = -EADDRINUSE;
|
|
|
|
|
|
|
|
if (!net_eq(sock_net(sk), &init_net))
|
|
|
|
return -ENOIOCTLCMD;
|
|
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
|
|
return -EPERM;
|
|
|
|
if (pn_socket_autobind(sk->sk_socket))
|
|
|
|
return -EAGAIN;
|
|
|
|
|
|
|
|
mutex_lock(&resource_mutex);
|
|
|
|
if (pnres.sk[res] == NULL) {
|
|
|
|
sock_hold(sk);
|
2012-01-12 12:41:32 +08:00
|
|
|
rcu_assign_pointer(pnres.sk[res], sk);
|
2010-09-15 20:30:11 +08:00
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
mutex_unlock(&resource_mutex);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int pn_sock_unbind_res(struct sock *sk, u8 res)
|
|
|
|
{
|
|
|
|
int ret = -ENOENT;
|
|
|
|
|
|
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
|
|
return -EPERM;
|
|
|
|
|
|
|
|
mutex_lock(&resource_mutex);
|
|
|
|
if (pnres.sk[res] == sk) {
|
2011-08-02 00:19:00 +08:00
|
|
|
RCU_INIT_POINTER(pnres.sk[res], NULL);
|
2010-09-15 20:30:11 +08:00
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
mutex_unlock(&resource_mutex);
|
|
|
|
|
|
|
|
if (ret == 0) {
|
|
|
|
synchronize_rcu();
|
|
|
|
sock_put(sk);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
void pn_sock_unbind_all_res(struct sock *sk)
|
|
|
|
{
|
2012-04-15 13:58:06 +08:00
|
|
|
unsigned int res, match = 0;
|
2010-09-15 20:30:11 +08:00
|
|
|
|
|
|
|
mutex_lock(&resource_mutex);
|
|
|
|
for (res = 0; res < 256; res++) {
|
|
|
|
if (pnres.sk[res] == sk) {
|
2011-08-02 00:19:00 +08:00
|
|
|
RCU_INIT_POINTER(pnres.sk[res], NULL);
|
2010-09-15 20:30:11 +08:00
|
|
|
match++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mutex_unlock(&resource_mutex);
|
|
|
|
|
|
|
|
while (match > 0) {
|
2011-04-13 07:27:36 +08:00
|
|
|
__sock_put(sk);
|
2010-09-15 20:30:11 +08:00
|
|
|
match--;
|
|
|
|
}
|
2011-04-13 07:27:36 +08:00
|
|
|
/* Caller is responsible for RCU sync before final sock_put() */
|
2010-09-15 20:30:11 +08:00
|
|
|
}
|
2010-09-15 20:30:14 +08:00
|
|
|
|
|
|
|
#ifdef CONFIG_PROC_FS
|
|
|
|
static struct sock **pn_res_get_idx(struct seq_file *seq, loff_t pos)
|
|
|
|
{
|
|
|
|
struct net *net = seq_file_net(seq);
|
2012-04-15 13:58:06 +08:00
|
|
|
unsigned int i;
|
2010-09-15 20:30:14 +08:00
|
|
|
|
|
|
|
if (!net_eq(net, &init_net))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (i = 0; i < 256; i++) {
|
|
|
|
if (pnres.sk[i] == NULL)
|
|
|
|
continue;
|
|
|
|
if (!pos)
|
|
|
|
return pnres.sk + i;
|
|
|
|
pos--;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct sock **pn_res_get_next(struct seq_file *seq, struct sock **sk)
|
|
|
|
{
|
|
|
|
struct net *net = seq_file_net(seq);
|
2012-04-15 13:58:06 +08:00
|
|
|
unsigned int i;
|
2010-09-15 20:30:14 +08:00
|
|
|
|
|
|
|
BUG_ON(!net_eq(net, &init_net));
|
|
|
|
|
|
|
|
for (i = (sk - pnres.sk) + 1; i < 256; i++)
|
|
|
|
if (pnres.sk[i])
|
|
|
|
return pnres.sk + i;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *pn_res_seq_start(struct seq_file *seq, loff_t *pos)
|
|
|
|
__acquires(resource_mutex)
|
|
|
|
{
|
|
|
|
mutex_lock(&resource_mutex);
|
|
|
|
return *pos ? pn_res_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *pn_res_seq_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
|
|
{
|
|
|
|
struct sock **sk;
|
|
|
|
|
|
|
|
if (v == SEQ_START_TOKEN)
|
|
|
|
sk = pn_res_get_idx(seq, 0);
|
|
|
|
else
|
|
|
|
sk = pn_res_get_next(seq, v);
|
|
|
|
(*pos)++;
|
|
|
|
return sk;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void pn_res_seq_stop(struct seq_file *seq, void *v)
|
|
|
|
__releases(resource_mutex)
|
|
|
|
{
|
|
|
|
mutex_unlock(&resource_mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int pn_res_seq_show(struct seq_file *seq, void *v)
|
|
|
|
{
|
|
|
|
int len;
|
|
|
|
|
|
|
|
if (v == SEQ_START_TOKEN)
|
|
|
|
seq_printf(seq, "%s%n", "rs uid inode", &len);
|
|
|
|
else {
|
|
|
|
struct sock **psk = v;
|
|
|
|
struct sock *sk = *psk;
|
|
|
|
|
|
|
|
seq_printf(seq, "%02X %5d %lu%n",
|
2012-05-24 15:10:10 +08:00
|
|
|
(int) (psk - pnres.sk),
|
|
|
|
from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)),
|
2010-09-16 12:34:41 +08:00
|
|
|
sock_i_ino(sk), &len);
|
2010-09-15 20:30:14 +08:00
|
|
|
}
|
|
|
|
seq_printf(seq, "%*s\n", 63 - len, "");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct seq_operations pn_res_seq_ops = {
|
|
|
|
.start = pn_res_seq_start,
|
|
|
|
.next = pn_res_seq_next,
|
|
|
|
.stop = pn_res_seq_stop,
|
|
|
|
.show = pn_res_seq_show,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int pn_res_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
|
|
|
return seq_open_net(inode, file, &pn_res_seq_ops,
|
|
|
|
sizeof(struct seq_net_private));
|
|
|
|
}
|
|
|
|
|
|
|
|
const struct file_operations pn_res_seq_fops = {
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.open = pn_res_open,
|
|
|
|
.read = seq_read,
|
|
|
|
.llseek = seq_lseek,
|
|
|
|
.release = seq_release_net,
|
|
|
|
};
|
|
|
|
#endif
|