From patchwork Fri Sep 25 21:24:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reinette Chatre X-Patchwork-Id: 50168 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8PLOdfs004370 for ; Fri, 25 Sep 2009 21:24:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752566AbZIYVYc (ORCPT ); Fri, 25 Sep 2009 17:24:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752513AbZIYVYa (ORCPT ); Fri, 25 Sep 2009 17:24:30 -0400 Received: from mga09.intel.com ([134.134.136.24]:1107 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752469AbZIYVY2 (ORCPT ); Fri, 25 Sep 2009 17:24:28 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 25 Sep 2009 14:08:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,453,1249282800"; d="scan'208";a="451732928" Received: from rc-desk.jf.intel.com (HELO localhost.localdomain) ([134.134.15.187]) by orsmga002.jf.intel.com with ESMTP; 25 Sep 2009 14:30:26 -0700 From: Reinette Chatre To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, ipw3945-devel@lists.sourceforge.net, Reinette Chatre Subject: [PATCH 2/8 v2.6.32 and w-t] iwlwifi: fix memory leak in command queue handling Date: Fri, 25 Sep 2009 14:24:22 -0700 Message-Id: <1253913868-8400-3-git-send-email-reinette.chatre@intel.com> X-Mailer: git-send-email 1.5.6.3 In-Reply-To: <1253913868-8400-1-git-send-email-reinette.chatre@intel.com> References: <1253913868-8400-1-git-send-email-reinette.chatre@intel.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Reinette Chatre Also free the array of command pointers and meta data of each command buffer when command queue is freed. Signed-off-by: Reinette Chatre --- drivers/net/wireless/iwlwifi/iwl-tx.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index ee0e26d..ad69479 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c @@ -197,6 +197,12 @@ void iwl_cmd_queue_free(struct iwl_priv *priv) pci_free_consistent(dev, priv->hw_params.tfd_size * txq->q.n_bd, txq->tfds, txq->q.dma_addr); + /* deallocate arrays */ + kfree(txq->cmd); + kfree(txq->meta); + txq->cmd = NULL; + txq->meta = NULL; + /* 0-fill queue descriptor structure */ memset(txq, 0, sizeof(*txq)); }