From patchwork Thu Mar 17 18:47:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 87413 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 3E69BB6FDF for ; Fri, 18 Mar 2011 05:47:15 +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 1Q0IE0-0002rP-3q; Thu, 17 Mar 2011 18:47:08 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Q0IDx-0002ne-BL for kernel-team@lists.ubuntu.com; Thu, 17 Mar 2011 18:47:05 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Q0IDx-0001mS-9U for ; Thu, 17 Mar 2011 18:47:05 +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 1Q0IDw-000460-U5 for kernel-team@lists.ubuntu.com; Thu, 17 Mar 2011 18:47:05 +0000 Subject: [CVE-2010-4263 Lucid] igb: only use vlan_gro_receive if vlans are registered, CVE-2010-4263 From: Leann Ogasawara To: kernel-team Date: Thu, 17 Mar 2011 11:47:01 -0700 Message-ID: <1300387621.1813.12.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 78006f719c80cc01424fb9a9d3bbd06eeba4dd13: Stefan Bader (1): Linux 2.6.32.33+drm33.15 are available in the git repository at: git://kernel.ubuntu.com/ogasawara/ubuntu-lucid.git CVE-2010-4263 Alexander Duyck (1): igb: only use vlan_gro_receive if vlans are registered, CVE-2010-4263 drivers/net/igb/igb_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) From 6ca830ea2699dc4456805c1fa42795d892265e08 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Tue, 23 Mar 2010 18:35:18 +0000 Subject: [PATCH] igb: only use vlan_gro_receive if vlans are registered, CVE-2010-4263 CVE-2010-4263 BugLink: http://bugs.launchpad.net/bugs/737024 This change makes it so that vlan_gro_receive is only used if vlans have been registered to the adapter structure. Previously we were just sending all vlan tagged frames in via this function but this results in a null pointer dereference when vlans are not registered. [ This fixes bugzilla entry 15582 -Eric Dumazet] Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Acked-by: Eric Dumazet Signed-off-by: David S. Miller (cherry picked from commit 31b24b955c3ebbb6f3008a6374e61cf7c05a193c) Signed-off-by: Leann Ogasawara Acked-by: Tim Gardner Acked-by: Brad Figg --- drivers/net/igb/igb_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 4d0534d..4370842 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -5011,7 +5011,7 @@ static void igb_receive_skb(struct igb_q_vector *q_vector, { struct igb_adapter *adapter = q_vector->adapter; - if (vlan_tag) + if (vlan_tag && adapter->vlgrp) vlan_gro_receive(&q_vector->napi, adapter->vlgrp, vlan_tag, skb); else