From patchwork Mon Jun 29 15:49:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Baechle X-Patchwork-Id: 29292 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 3130AB7102 for ; Tue, 30 Jun 2009 01:49:34 +1000 (EST) Received: by ozlabs.org (Postfix) id 20DEEDDDD4; Tue, 30 Jun 2009 01:49:34 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 9C578DDDB6 for ; Tue, 30 Jun 2009 01:49:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753987AbZF2PtW (ORCPT ); Mon, 29 Jun 2009 11:49:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753356AbZF2PtW (ORCPT ); Mon, 29 Jun 2009 11:49:22 -0400 Received: from h5.dl5rb.org.uk ([81.2.74.5]:38734 "EHLO h5.dl5rb.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753059AbZF2PtV (ORCPT ); Mon, 29 Jun 2009 11:49:21 -0400 Received: from h5.dl5rb.org.uk (localhost.localdomain [127.0.0.1]) by h5.dl5rb.org.uk (8.14.3/8.14.3) with ESMTP id n5TFn5tm019039; Mon, 29 Jun 2009 16:49:05 +0100 Received: (from ralf@localhost) by h5.dl5rb.org.uk (8.14.3/8.14.3/Submit) id n5TFn5qT019037; Mon, 29 Jun 2009 16:49:05 +0100 Date: Mon, 29 Jun 2009 16:49:05 +0100 From: Ralf Baechle To: Willy Tarreau Cc: Frank Seidel , linux-mips@linux-mips.org, netdev@vger.kernel.org Subject: [PATCH] linux-2.4: br2684: allocation out of atomic context Message-ID: <20090629154905.GD18570@linux-mips.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arne Redlich Moved GFP_Kernel allocation out of atomic context Signed-off-by: Arne Redlich Signed-off-by: Frank Seidel Signed-off-by: Ralf Baechle --- net/atm/br2684.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/net/atm/br2684.c +++ b/net/atm/br2684.c @@ -509,6 +509,10 @@ Note: we do not have explicit unassign, MOD_DEC_USE_COUNT; return -EFAULT; } + brvcc = kmalloc(sizeof(struct br2684_vcc), GFP_KERNEL); + if (!brvcc) + return -ENOMEM; + memset(brvcc, 0, sizeof(struct br2684_vcc)); write_lock_irq(&devs_lock); brdev = br2684_find_dev(&be.ifspec); if (brdev == NULL) { @@ -532,11 +536,6 @@ Note: we do not have explicit unassign, err = -EINVAL; goto error; } - brvcc = kmalloc(sizeof(struct br2684_vcc), GFP_KERNEL); - if (!brvcc) { - err = -ENOMEM; - goto error; - } memset(brvcc, 0, sizeof(struct br2684_vcc)); DPRINTK("br2684_regvcc vcc=%p, encaps=%d, brvcc=%p\n", atmvcc, be.encaps, brvcc); @@ -567,6 +566,7 @@ Note: we do not have explicit unassign, return 0; error: write_unlock_irq(&devs_lock); + kfree(brvcc); MOD_DEC_USE_COUNT; return err; }