Return-path: Received: from mga02.intel.com ([134.134.136.20]:51082 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754202AbZHCTIM (ORCPT ); Mon, 3 Aug 2009 15:08:12 -0400 Subject: Re: [PATCH] iwlwifi: avoid memory leak in iwl_dbgfs_nvm_read From: reinette chatre To: "John W. Linville" Cc: "linux-wireless@vger.kernel.org" , Martin Ettl In-Reply-To: <1249325388-6496-1-git-send-email-linville@tuxdriver.com> References: <1249325388-6496-1-git-send-email-linville@tuxdriver.com> Content-Type: text/plain Date: Mon, 03 Aug 2009 12:08:12 -0700 Message-Id: <1249326492.30019.4277.camel@rc-desk> Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Mon, 2009-08-03 at 11:49 -0700, John W. Linville wrote: > Reported-by: Martin Ettl > Signed-off-by: John W. Linville > --- > drivers/net/wireless/iwlwifi/iwl-debugfs.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c > index 11e08c0..6525e41 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c > +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c > @@ -318,7 +318,8 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file, > ptr = priv->eeprom; > if (!ptr) { > IWL_ERR(priv, "Invalid EEPROM/OTP memory\n"); > - return -ENOMEM; > + ret = -ENOMEM; > + goto out; > } > pos += scnprintf(buf + pos, buf_size - pos, "NVM Type: %s\n", > (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP) > @@ -333,6 +334,8 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file, > } > > ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); > + > +out: > kfree(buf); > return ret; > } There was another patch also that was acked by Zhu Yi. See http://thread.gmane.org/gmane.linux.kernel.wireless.general/37032 Reinette