From patchwork Wed Dec 7 16:58:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 129993 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 364CE1007D5 for ; Thu, 8 Dec 2011 03:59:00 +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 1RYKpZ-0005jQ-Mu; Wed, 07 Dec 2011 16:58:53 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RYKpY-0005jL-Jy for kernel-team@lists.ubuntu.com; Wed, 07 Dec 2011 16:58:52 +0000 Received: from p5b2e4a3e.dip.t-dialin.net ([91.46.74.62] helo=[192.168.2.5]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1RYKpY-0002Xm-HK; Wed, 07 Dec 2011 16:58:52 +0000 Message-ID: <4EDF9B4B.2050302@canonical.com> Date: Wed, 07 Dec 2011 17:58:51 +0100 From: Stefan Bader User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:8.0) Gecko/20111124 Thunderbird/8.0 MIME-Version: 1.0 To: Tim Gardner Subject: Re: APPLIED: [CVE-2011-1576] core: Fix memory leak/corruption on VLAN GRO_DROP References: <1316440807-9603-1-git-send-email-stefan.bader@canonical.com> <4E774DEA.6000604@canonical.com> <4EDF9873.6090605@canonical.com> In-Reply-To: <4EDF9873.6090605@canonical.com> X-Enigmail-Version: 1.4a1pre Cc: kernel-team@lists.ubuntu.com 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 and the revesion example for Maverick# From 52786465cd5f91046b05bdbbf44282d3cf40b96c Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Wed, 7 Dec 2011 16:07:30 +0100 Subject: [PATCH 2/2] Revert "core: Fix memory leak/corruption on VLAN GRO_DROP, CVE-2011-1576" This reverts commit 1f14046bca5b50653a21adb9126ddf783ba2f481 as there was a newer, more in the spirit of upstream fix for it. Signed-off-by: Stefan Bader --- net/core/dev.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index f61bf98..79ed8f5 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3267,9 +3267,6 @@ gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb, break; case GRO_DROP: - kfree_skb(skb); - break; - case GRO_MERGED_FREE: napi_reuse_skb(napi, skb); break; -- 1.7.5.4