All of lore.kernel.org
 help / color / mirror / Atom feed
From: Isaac Boukris <iboukris@gmail.com>
To: stephen@networkplumber.org, davem@davemloft.net,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Isaac Boukris <iboukris@gmail.com>
Subject: [PATCH] unix: escape all null bytes in abstract unix domain socket
Date: Sat, 29 Oct 2016 22:20:20 +0300	[thread overview]
Message-ID: <1477768820-1295-2-git-send-email-iboukris@gmail.com> (raw)
In-Reply-To: <1477768820-1295-1-git-send-email-iboukris@gmail.com>

Abstract unix domain socket may embed null characters,
these should be translated to '@' when printed out to
proc the same way the null prefix is currently being
translated.

This helps for tools such as netstat, lsof and the proc
based implementation in ss to show all the significant
bytes of the name (instead of getting cut at the first
null occurrence).

Signed-off-by: Isaac Boukris <iboukris@gmail.com>
---
 net/unix/af_unix.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 145082e..9250b03 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2805,14 +2805,19 @@ static int unix_seq_show(struct seq_file *seq, void *v)
 
 			i = 0;
 			len = u->addr->len - sizeof(short);
-			if (!UNIX_ABSTRACT(s))
+			if (!UNIX_ABSTRACT(s)) {
 				len--;
-			else {
+				for ( ; i < len; i++)
+					seq_putc(seq,
+						 u->addr->name->sun_path[i]);
+			} else {
 				seq_putc(seq, '@');
 				i++;
+				for ( ; i < len; i++)
+					seq_putc(seq,
+						 u->addr->name->sun_path[i] ?:
+						 '@');
 			}
-			for ( ; i < len; i++)
-				seq_putc(seq, u->addr->name->sun_path[i]);
 		}
 		unix_state_unlock(s);
 		seq_putc(seq, '\n');
-- 
2.7.4

  reply	other threads:[~2016-10-29 19:22 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-29 19:20 [PATCH] iproute2: ss: escape all null bytes in abstract unix domain socket Isaac Boukris
2016-10-29 19:20 ` Isaac Boukris [this message]
2016-10-31 19:31   ` [PATCH] unix: " David Miller
2016-11-01  0:56     ` Isaac Boukris
2016-11-12  7:17 ` [PATCH] iproute2: ss: " Stephen Hemminger
2016-12-02 18:59   ` Eric Dumazet
2016-12-02 23:18     ` Stephen Hemminger
2016-12-02 23:24       ` Eric Dumazet
2016-12-05  5:38         ` Isaac Boukris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1477768820-1295-2-git-send-email-iboukris@gmail.com \
    --to=iboukris@gmail.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=stephen@networkplumber.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.