From 84c87fe752047d6dbcb77e04d33bd236b6fb463c Mon Sep 17 00:00:00 2001
From: Yuri Ershov <ext-yuri.ershov@nokia.com>
Date: Tue, 29 Jun 2010 15:08:07 +0400
Subject: [PATCH] --- yaml --- r: 203926 b: refs/heads/master c:
 d080e2755d840ede60128cc914a070868ebabc1e h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/wireless/nl80211.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d679a888da8d..fc41010182b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4ab7eb0aecbe56ac280486c61cd3f0f6c42870b
+refs/heads/master: d080e2755d840ede60128cc914a070868ebabc1e
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index fbfac588297c..37902a54e9c1 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -2769,6 +2769,7 @@ static int nl80211_get_mesh_params(struct sk_buff *skb,
 
  nla_put_failure:
 	genlmsg_cancel(msg, hdr);
+	nlmsg_free(msg);
 	err = -EMSGSIZE;
  out:
 	/* Cleanup */
@@ -2960,6 +2961,7 @@ static int nl80211_get_reg(struct sk_buff *skb, struct genl_info *info)
 
 nla_put_failure:
 	genlmsg_cancel(msg, hdr);
+	nlmsg_free(msg);
 	err = -EMSGSIZE;
 out:
 	mutex_unlock(&cfg80211_mutex);