From patchwork Sun Nov 7 16:33:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Rosenberg X-Patchwork-Id: 70363 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 34DEFB70F9 for ; Mon, 8 Nov 2010 03:33:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753902Ab0KGQdM (ORCPT ); Sun, 7 Nov 2010 11:33:12 -0500 Received: from mx1.vsecurity.com ([209.67.252.12]:57502 "EHLO mx1.vsecurity.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753871Ab0KGQdL (ORCPT ); Sun, 7 Nov 2010 11:33:11 -0500 Received: (qmail 54860 invoked from network); 7 Nov 2010 16:33:10 -0000 Received: from c-98-229-66-118.hsd1.ma.comcast.net (HELO [192.168.1.128]) (drosenbe@[98.229.66.118]) (envelope-sender ) by mx1.vsecurity.com (qmail-ldap-1.03) with SMTP for ; 7 Nov 2010 16:33:10 -0000 Subject: [PATCH 9/9] Fix leaking of kernel heap addresses in net/ From: Dan Rosenberg To: chas@cmf.nrl.navy.mil, davem@davemloft.net, kuznet@ms2.inr.ac.ru, pekkas@netcore.fi, jmorris@namei.org, yoshfuji@linux-ipv6.org, kaber@trash.net, remi.denis-courmont@nokia.com Cc: netdev@vger.kernel.org, security@kernel.org, stable@kernel.org Date: Sun, 07 Nov 2010 11:33:08 -0500 Message-ID: <1289147588.3090.147.camel@Dan> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Dan Rosenberg --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -urp linux-2.6.37-rc1.orig/net/unix/af_unix.c linux-2.6.37-rc1/net/unix/af_unix.c --- linux-2.6.37-rc1.orig/net/unix/af_unix.c 2010-11-01 07:54:12.000000000 -0400 +++ linux-2.6.37-rc1/net/unix/af_unix.c 2010-11-07 10:46:27.000000000 -0500 @@ -353,7 +353,8 @@ static void unix_sock_destructor(struct WARN_ON(!sk_unhashed(sk)); WARN_ON(sk->sk_socket); if (!sock_flag(sk, SOCK_DEAD)) { - printk(KERN_INFO "Attempt to release alive unix socket: %p\n", sk); + printk(KERN_INFO "Attempt to release alive unix socket: %lu\n", + sock_i_ino(sk)); return; } @@ -2198,8 +2199,8 @@ static int unix_seq_show(struct seq_file struct unix_sock *u = unix_sk(s); unix_state_lock(s); - seq_printf(seq, "%p: %08X %08X %08X %04X %02X %5lu", - s, + 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,