From patchwork Wed Feb 2 19:04:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 81518 X-Patchwork-Delegate: stefan.bader@canonical.com 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 937AFB70FF for ; Thu, 3 Feb 2011 06:05:04 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Pki0h-0000gk-4Y; Wed, 02 Feb 2011 19:04:59 +0000 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Pki0e-0000gf-VD for kernel-team@lists.ubuntu.com; Wed, 02 Feb 2011 19:04:57 +0000 Received: from sepang.rtg.net (unknown [10.0.2.5]) by mail.tpi.com (Postfix) with ESMTP id 8E0E529B771 for ; Wed, 2 Feb 2011 11:04:24 -0800 (PST) Received: by sepang.rtg.net (Postfix, from userid 1000) id 7F466F89F8; Wed, 2 Feb 2011 12:04:54 -0700 (MST) To: kernel-team@lists.ubuntu.com Subject: Dapper CVE-2010-3880, inet_diag: Make sure we actually run the same bytecode we audited Message-Id: <20110202190454.7F466F89F8@sepang.rtg.net> Date: Wed, 2 Feb 2011 12:04:54 -0700 (MST) From: timg@tpi.com (Tim Gardner) 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: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com The following changes since commit 2677c2506a252a7a8f322434ce3e3ae7acffdd39: Thomas Gleixner (1): x86: replace LOCK_PREFIX in futex.h, CVE-2010-3086 are available in the git repository at: git://kernel.ubuntu.com/rtg/ubuntu-dapper.git CVE-2010-3880 Tim Gardner (1): inet_diag: Make sure we actually run the same bytecode we audited, CVE-2010-3880 net/ipv4/inet_diag.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) From e89143e20d2e91b55d7b1f78b57304dae7648160 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Wed, 2 Feb 2011 11:10:04 -0700 Subject: [PATCH] inet_diag: Make sure we actually run the same bytecode we audited, CVE-2010-3880 BugLink: http://bugs.launchpad.net/bugs/711865 CVE-2010-3880 We were using nlmsg_find_attr() to look up the bytecode by attribute when auditing, but then just using the first attribute when actually running bytecode. So, if we received a message with two attribute elements, where only the second had type INET_DIAG_REQ_BYTECODE, we would validate and run different bytecode strings. Fix this by consistently using nlmsg_find_attr everywhere. Signed-off-by: Nelson Elhage Signed-off-by: Thomas Graf Signed-off-by: David S. Miller (back ported from commit 22e76c849d505d87c5ecf3d3e6742a65f0ff4860) Signed-off-by: Tim Gardner Acked-by: Stefan Bader --- net/ipv4/inet_diag.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-)