From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Wed, 13 May 2009 21:04:39 +0000 (-0400)
Subject: cfg80211: return immediately if num reg rules > NL80211_MAX_SUPP_REG_RULES
X-Git-Tag: v2.6.31-rc1~14^2~390^2~52
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4776c6e7f66f853011bc1fd6fe37fa63f0b6982c;p=profile%2Fivi%2Fkernel-x86-ivi.git

cfg80211: return immediately if num reg rules > NL80211_MAX_SUPP_REG_RULES

This has no functional change except we save a kfree(rd) and
allows us to clean this code up a bit after this. We do
avoid an unnecessary kfree(NULL) but calling that was OK too.

Cc: stable@kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 1cf57f5..52a8779 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -2567,7 +2567,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
 			rem_reg_rules) {
 		num_rules++;
 		if (num_rules > NL80211_MAX_SUPP_REG_RULES)
-			goto bad_reg;
+			return -EINVAL;
 	}
 
 	if (!reg_is_valid_request(alpha2))