From patchwork Wed Nov 26 20:38:20 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Divy Le Ray X-Patchwork-Id: 10984 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 0CCB5DDE07 for ; Thu, 27 Nov 2008 07:39:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752847AbYKZUi4 (ORCPT ); Wed, 26 Nov 2008 15:38:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752812AbYKZUiz (ORCPT ); Wed, 26 Nov 2008 15:38:55 -0500 Received: from stargate.chelsio.com ([12.22.49.110]:10952 "EHLO stargate.chelsio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752538AbYKZUiz (ORCPT ); Wed, 26 Nov 2008 15:38:55 -0500 Received: from speedy5.asicdesigners.com (speedy5.asicdesigners.com [10.192.166.133]) by stargate.chelsio.com (8.13.1/8.13.1) with ESMTP id mAQKcnDH024041; Wed, 26 Nov 2008 12:38:49 -0800 Received: from [127.0.1.1] (localhost [127.0.0.1]) by speedy5.asicdesigners.com (8.14.2/8.14.2/Debian-2build1) with ESMTP id mAQKcK6B004850; Wed, 26 Nov 2008 12:38:20 -0800 From: Divy Le Ray Subject: [PATCH 2/4 2.6.29] cxgb3 - avoid potential memory leak. To: jeff@garzik.org Cc: davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, swise@opengridcomputing.com Date: Wed, 26 Nov 2008 12:38:20 -0800 Message-ID: <20081126203820.4819.17969.stgit@speedy5> User-Agent: StGIT/0.13 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Divy Le Ray Add consistency in alloc_ring() parameter checking to avoid potential memory leaks. alloc_ring() callers are correct fo far. Signed-off-by: Divy Le Ray --- drivers/net/cxgb3/sge.c | 5 ++--- 1 files changed, 2 insertions(+), 3 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 diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c index 268f158..bc6a8dc 100644 --- a/drivers/net/cxgb3/sge.c +++ b/drivers/net/cxgb3/sge.c @@ -549,16 +549,15 @@ static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size, if (!p) return NULL; - if (sw_size) { + if (sw_size && metadata) { s = kcalloc(nelem, sw_size, GFP_KERNEL); if (!s) { dma_free_coherent(&pdev->dev, len, p, *phys); return NULL; } - } - if (metadata) *(void **)metadata = s; + } memset(p, 0, len); return p; }