From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from bombadil.infradead.org ([18.85.46.34]:53226 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752129AbZBTFnP (ORCPT ); Fri, 20 Feb 2009 00:43:15 -0500 From: "Luis R. Rodriguez" To: linville@tuxdriver.com, johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, "Luis R. Rodriguez" Subject: [PATCH v5 11/15] cfg80211: free rd on unlikely event on 11d hint Date: Fri, 20 Feb 2009 00:42:46 -0500 Message-Id: <1235108570-17652-12-git-send-email-lrodriguez@atheros.com> (sfid-20090220_065322_935136_5F6A60D8) In-Reply-To: <1235108570-17652-1-git-send-email-lrodriguez@atheros.com> References: <1235108570-17652-1-git-send-email-lrodriguez@atheros.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: This was never happening but it was still wrong, so correct it. Signed-off-by: Luis R. Rodriguez --- net/wireless/reg.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index baf50ca..af762be 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1341,7 +1341,7 @@ void regulatory_hint_11d(struct wiphy *wiphy, * it as it would indicate a mistake in the current design */ if (WARN_ON(reg_same_country_ie_hint(wiphy, checksum))) - goto out; + goto free_rd_out; /* We keep this around for when CRDA comes back with a response so * we can intersect with that */ @@ -1350,6 +1350,10 @@ void regulatory_hint_11d(struct wiphy *wiphy, __regulatory_hint(wiphy, REGDOM_SET_BY_COUNTRY_IE, country_ie_regdomain->alpha2, checksum, env); + goto out; + +free_rd_out: + kfree(rd); out: mutex_unlock(&cfg80211_mutex); } -- 1.6.0.3