From patchwork Tue Sep 27 10:34:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: huajun li X-Patchwork-Id: 116572 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 CCBB6B6F72 for ; Tue, 27 Sep 2011 20:34:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753262Ab1I0Kef (ORCPT ); Tue, 27 Sep 2011 06:34:35 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:42378 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752878Ab1I0Kef (ORCPT ); Tue, 27 Sep 2011 06:34:35 -0400 Received: by fxe4 with SMTP id 4so6957878fxe.19 for ; Tue, 27 Sep 2011 03:34:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=G5Z6cOjfrXCtScwl22HCrm36vK0L+1bzl9ISNFFFphU=; b=s6Q09Np+oblCZNOFrimt6RzioYRCuJgScAjgBdj3SEShU9jdNs/8r696s+KBbNe8N9 b/StNh+J4O8h+I4cYh7VHPu1hgyjfuKn2X00nW8yQctWhmLwEGrfsS0vnv7gtsOzF7kc K60Wa7VsO7J3tem0QBW+MidSG6QCDx3+eqarw= MIME-Version: 1.0 Received: by 10.223.47.216 with SMTP id o24mr2864834faf.145.1317119673768; Tue, 27 Sep 2011 03:34:33 -0700 (PDT) Received: by 10.223.114.195 with HTTP; Tue, 27 Sep 2011 03:34:33 -0700 (PDT) Date: Tue, 27 Sep 2011 18:34:33 +0800 Message-ID: Subject: [PATCH v2] net/flow: Fix potential memory leak From: Huajun Li To: David Miller Cc: Eric Dumazet , netdev , Huajun Li Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org While preparing net flow caches, once fail may cause potential memory leak , fix it. Acked-by: Eric Dumazet Signed-off-by: Huajun Li --- net/core/flow.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/net/core/flow.c b/net/core/flow.c index 555a456..4e60fce 100644 --- a/net/core/flow.c +++ b/net/core/flow.c @@ -413,7 +413,7 @@ static int __init flow_cache_init(struct flow_cache *fc) for_each_online_cpu(i) { if (flow_cache_cpu_prepare(fc, i)) - return -ENOMEM; + goto err; } fc->hotcpu_notifier = (struct notifier_block){ .notifier_call = flow_cache_cpu, @@ -426,6 +426,20 @@ static int __init flow_cache_init(struct flow_cache *fc) add_timer(&fc->rnd_timer); return 0; + +err: + for_each_possible_cpu(i) { + struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, i); + kfree(fcp->hash_table); + fcp->hash_table = NULL; + } + + if (fc->percpu) { + free_percpu(fc->percpu); + fc->percpu = NULL; + } + + return -ENOMEM; } static int __init flow_cache_init_global(void)