netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] unix: show socket peer if no addr is given in /proc/net/unix
@ 2014-01-08  5:18 Masatake YAMATO
  2014-01-08  6:00 ` David Miller
  2014-01-08 22:19 ` Sergei Shtylyov
  0 siblings, 2 replies; 4+ messages in thread
From: Masatake YAMATO @ 2014-01-08  5:18 UTC (permalink / raw)
  To: netdev; +Cc: yamato

Path field of /proc/net/unix is empty if an address is not given
to a socket. Typical way to create such socket is calling
socketpair. The empty fields make it difficult to understand the
communication between processes. e.g. lsof cannot resolve the role of
file descriptors well.

This patch fills the empty fields with unix_peer.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---
 net/unix/af_unix.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 800ca61..1700133 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2340,7 +2340,9 @@ static int unix_seq_show(struct seq_file *seq, void *v)
 	else {
 		struct sock *s = v;
 		struct unix_sock *u = unix_sk(s);
+		struct sock *s_peer;
 		unix_state_lock(s);
+		s_peer = unix_peer(s);
 
 		seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu",
 			s,
@@ -2367,7 +2369,8 @@ static int unix_seq_show(struct seq_file *seq, void *v)
 			}
 			for ( ; i < len; i++)
 				seq_putc(seq, u->addr->name->sun_path[i]);
-		}
+		} else if (s_peer)
+			seq_printf(seq, " #%pK", s_peer);
 		unix_state_unlock(s);
 		seq_putc(seq, '\n');
 	}
-- 
1.8.4.2

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-01-08 21:19 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-08  5:18 [PATCH] unix: show socket peer if no addr is given in /proc/net/unix Masatake YAMATO
2014-01-08  6:00 ` David Miller
2014-01-08  6:50   ` Masatake YAMATO
2014-01-08 22:19 ` Sergei Shtylyov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).