netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dan Rosenberg <drosenberg@vsecurity.com>
To: "David S. Miller" <davem@davemloft.net>,
	Oliver Hartkopp <socketcan@hartkopp.net>,
	Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
	Urs Thuermann <urs.thuermann@volkswagen.de>,
	Hideaki YOSHI
Subject: [PATCH 10/10] Fix leaking of kernel heap addresses in net/
Date: Thu, 11 Nov 2010 20:07:25 -0500	[thread overview]
Message-ID: <1289524045.5167.74.camel@dan> (raw)

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 3c95304..ba7cf7c 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2198,16 +2198,33 @@ static int unix_seq_show(struct seq_file *seq, void *v)
 		struct unix_sock *u = unix_sk(s);
 		unix_state_lock(s);
 
-		seq_printf(seq, "%p: %08X %08X %08X %04X %02X %5lu",
-			s,
-			atomic_read(&s->sk_refcnt),
-			0,
-			s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
-			s->sk_type,
-			s->sk_socket ?
-			(s->sk_state == TCP_ESTABLISHED ? SS_CONNECTED : SS_UNCONNECTED) :
-			(s->sk_state == TCP_ESTABLISHED ? SS_CONNECTING : SS_DISCONNECTING),
-			sock_i_ino(s));
+		/* Only expose kernel addresses to privileged readers */
+		if (capable(CAP_NET_ADMIN))
+			seq_printf(seq, "%p: %08X %08X %08X %04X %02X %5lu",
+				s,
+				atomic_read(&s->sk_refcnt),
+				0,
+				s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
+				s->sk_type,
+				s->sk_socket ?
+				(s->sk_state == TCP_ESTABLISHED ?
+				SS_CONNECTED : SS_UNCONNECTED) :
+				(s->sk_state == TCP_ESTABLISHED ?
+				SS_CONNECTING : SS_DISCONNECTING),
+				sock_i_ino(s));
+		else
+			seq_printf(seq, "%d: %08X %08X %08X %04X %02X %5lu",
+				0,
+				atomic_read(&s->sk_refcnt),
+				0,
+				s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
+				s->sk_type,
+				s->sk_socket ?
+				(s->sk_state == TCP_ESTABLISHED ?
+				SS_CONNECTED : SS_UNCONNECTED) :
+				(s->sk_state == TCP_ESTABLISHED ?
+				SS_CONNECTING : SS_DISCONNECTING),
+				sock_i_ino(s));
 
 		if (u->addr) {
 			int i, len;




                 reply	other threads:[~2010-11-12  1:11 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1289524045.5167.74.camel@dan \
    --to=drosenberg@vsecurity.com \
    --cc=davem@davemloft.net \
    --cc=kuznet@ms2.inr.ac.ru \
    --cc=socketcan@hartkopp.net \
    --cc=urs.thuermann@volkswagen.de \
    /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 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).