From patchwork Mon Apr 18 20:52:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 91842 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 6ED92B6FCE for ; Tue, 19 Apr 2011 06:53:17 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QBvRP-0003rE-0y; Mon, 18 Apr 2011 20:53:03 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QBvRM-0003r9-Sx for kernel-team@lists.ubuntu.com; Mon, 18 Apr 2011 20:53:00 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QBvRM-0001IU-RQ for ; Mon, 18 Apr 2011 20:53:00 +0000 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1QBvRM-0002Mj-CX for kernel-team@lists.ubuntu.com; Mon, 18 Apr 2011 20:53:00 +0000 Subject: [CVE-2010-4565 Maverick] CAN: Use inode instead of kernel address for /proc file, CVE-2010-4565 From: Leann Ogasawara To: kernel-team Date: Mon, 18 Apr 2011 13:52:56 -0700 Message-ID: <1303159976.29132.31.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com The following changes since commit edf1830290f88fb7c7c8baebd1fa7c49e8c522c4: Mel Gorman (1): UBUNTU: (pre-stable) mm: page allocator: adjust the per-cpu counter threshold when memory is low are available in the git repository at: git://kernel.ubuntu.com/ogasawara/ubuntu-maverick.git CVE-2010-4565 Dan Rosenberg (1): CAN: Use inode instead of kernel address for /proc file, CVE-2010-4565 net/can/bcm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) From 3e9b5670cda97a3a3d6810f3095ff8d2430e0b85 Mon Sep 17 00:00:00 2001 From: Dan Rosenberg Date: Sun, 26 Dec 2010 06:54:53 +0000 Subject: [PATCH] CAN: Use inode instead of kernel address for /proc file, CVE-2010-4565 BugLink: http://bugs.launchpad.net/bugs/765007 CVE-2010-4565 Since the socket address is just being used as a unique identifier, its inode number is an alternative that does not leak potentially sensitive information. CC-ing stable because MITRE has assigned CVE-2010-4565 to the issue. Signed-off-by: Dan Rosenberg Acked-by: Oliver Hartkopp Signed-off-by: David S. Miller (cherry picked from commit 9f260e0efa4766e56d0ac14f1aeea6ee5eb8fe83) Signed-off-by: Leann Ogasawara Acked-by: Brad Figg Acked-by: Tim Gardner --- net/can/bcm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/can/bcm.c b/net/can/bcm.c index 6faa825..9d5e8ac 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -125,7 +125,7 @@ struct bcm_sock { struct list_head tx_ops; unsigned long dropped_usr_msgs; struct proc_dir_entry *bcm_proc_read; - char procname [20]; /* pointer printed in ASCII with \0 */ + char procname [32]; /* inode number in decimal with \0 */ }; static inline struct bcm_sock *bcm_sk(const struct sock *sk) @@ -1521,7 +1521,7 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len, if (proc_dir) { /* unique socket address as filename */ - sprintf(bo->procname, "%p", sock); + sprintf(bo->procname, "%lu", sock_i_ino(sk)); bo->bcm_proc_read = proc_create_data(bo->procname, 0644, proc_dir, &bcm_proc_fops, sk);