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 8/10] Fix leaking of kernel heap addresses in net/
Date: Thu, 11 Nov 2010 20:07:19 -0500	[thread overview]
Message-ID: <1289524039.5167.72.camel@dan> (raw)

diff --git a/net/phonet/socket.c b/net/phonet/socket.c
index 25f746d..2ca2a87 100644
--- a/net/phonet/socket.c
+++ b/net/phonet/socket.c
@@ -631,14 +631,25 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
 		struct sock *sk = v;
 		struct pn_sock *pn = pn_sk(sk);
 
-		seq_printf(seq, "%2d %04X:%04X:%02X %02X %08X:%08X %5d %lu "
-			"%d %p %d%n",
-			sk->sk_protocol, pn->sobject, 0, pn->resource,
-			sk->sk_state,
-			sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
-			sock_i_uid(sk), sock_i_ino(sk),
-			atomic_read(&sk->sk_refcnt), sk,
-			atomic_read(&sk->sk_drops), &len);
+		/* Only expose kernel addresses to privileged readers */
+		if (capable(CAP_NET_ADMIN))
+			seq_printf(seq, "%2d %04X:%04X:%02X %02X %08X:%08X "
+				"%5d %lu %d %p %d%n",
+				sk->sk_protocol, pn->sobject, 0, pn->resource,
+				sk->sk_state,
+				sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
+				sock_i_uid(sk), sock_i_ino(sk),
+				atomic_read(&sk->sk_refcnt), sk,
+				atomic_read(&sk->sk_drops), &len);
+		else
+			seq_printf(seq, "%2d %04X:%04X:%02X %02X %08X:%08X "
+				"%5d %lu %d %d %d%n",
+				sk->sk_protocol, pn->sobject, 0, pn->resource,
+				sk->sk_state,
+				sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
+				sock_i_uid(sk), sock_i_ino(sk),
+				atomic_read(&sk->sk_refcnt), 0,
+				atomic_read(&sk->sk_drops), &len);
 	}
 	seq_printf(seq, "%*s\n", 127 - len, "");
 	return 0;




                 reply	other threads:[~2010-11-12  1:10 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=1289524039.5167.72.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).