From patchwork Wed Mar 17 10:09:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo-Fu Tseng X-Patchwork-Id: 47927 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0AFEFB7D2F for ; Wed, 17 Mar 2010 21:16:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754139Ab0CQKPy (ORCPT ); Wed, 17 Mar 2010 06:15:54 -0400 Received: from cooldavid.org ([114.33.45.68]:35758 "EHLO cooldavid.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754111Ab0CQKPx (ORCPT ); Wed, 17 Mar 2010 06:15:53 -0400 Received: from cdgd (cdgd.CDPA.nsysu.edu.tw [140.117.201.186]) by cooldavid.org (Postfix) with SMTP id 2BBD87D9FD; Wed, 17 Mar 2010 18:15:34 +0800 (CST) Received: by cdgd (sSMTP sendmail emulation); Wed, 17 Mar 2010 18:09:39 +0800 From: cooldavid@cooldavid.org To: "David Miller" Cc: Guo-Fu Tseng , "linux-netdev" , "Ethan Hsiao" , "Devinchiu" , "Hsiu-Che Chao" , stable@kernel.org Subject: [PATCH net-2.6 1/3] jme: Fix VLAN memory leak Date: Wed, 17 Mar 2010 18:09:29 +0800 Message-Id: <1268820571-2092-1-git-send-email-cooldavid@cooldavid.org> X-Mailer: git-send-email 1.6.4.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Guo-Fu Tseng Fix memory leak while receiving 8021q tagged packet which is not registered by user. Signed-off-by: Guo-Fu Tseng Cc: stable@kernel.org --- drivers/net/jme.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/jme.c b/drivers/net/jme.c index 0f31497..cfc7b98 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c @@ -946,6 +946,8 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx) jme->jme_vlan_rx(skb, jme->vlgrp, le16_to_cpu(rxdesc->descwb.vlan)); NET_STAT(jme).rx_bytes += 4; + } else { + dev_kfree_skb(skb); } } else { jme->jme_rx(skb);