[<prev] [next>] [day] [month] [year] [list]
Message-ID: <1289524045.5167.74.camel@dan>
Date: Thu, 11 Nov 2010 20:07:25 -0500
From: Dan Rosenberg <drosenberg@...curity.com>
To: "David S. Miller" <davem@...emloft.net>,
Oliver Hartkopp <socketcan@...tkopp.net>,
Alexey Kuznetsov <kuznet@....inr.ac.ru>,
Urs Thuermann <urs.thuermann@...kswagen.de>,
Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org>,
Patrick McHardy <kaber@...sh.net>,
James Morris <jmorris@...ei.org>,
Remi Denis-Courmont <remi.denis-courmont@...ia.com>,
"Pekka Savola (ipv6)" <pekkas@...core.fi>,
Sridhar Samudrala <sri@...ibm.com>,
Vlad Yasevich <vladislav.yasevich@...com>,
Tejun Heo <tj@...nel.org>,
Eric Dumazet <eric.dumazet@...il.com>,
Li Zefan <lizf@...fujitsu.com>, Joe Perches <joe@...ches.com>,
Stephen Hemminger <shemminger@...tta.com>,
Jamal Hadi Salim <hadi@...atatu.com>,
"Eric W. Biederman" <ebiederm@...ssion.com>,
Alexey Dobriyan <adobriyan@...il.com>,
Jiri Pirko <jpirko@...hat.com>,
Johannes Berg <johannes.berg@...el.com>,
Daniel Lezcano <daniel.lezcano@...e.fr>,
Pavel Emelyanov <xemul@...nvz.org>,
socketcan-core@...ts.berlios.de, netdev@...r.kernel.org,
linux-sctp@...r.kernel.org
Subject: [PATCH 10/10] Fix leaking of kernel heap addresses in net/
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;
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists