From 52786465cd5f91046b05bdbbf44282d3cf40b96c Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader@canonical.com>
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 <stefan.bader@canonical.com>
---
net/core/dev.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
@@ -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