From c1611d2959abdbd5eb92988a9bf910f5e38c8498 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Wed, 12 Nov 2008 14:22:01 -0800
Subject: [PATCH] --- yaml --- r: 122272 b: refs/heads/master c:
 88dc1c3f7f9058cd5ceae1e4b53453484c7b0364 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index be9b382bb793..eea3cc965aef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02ba0b3263f4eb41d2a5714cbe99207ae491a964
+refs/heads/master: 88dc1c3f7f9058cd5ceae1e4b53453484c7b0364
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index f8e7beb23add..f0ff3d1779da 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -352,6 +352,9 @@ static bool is_valid_rd(const struct ieee80211_regdomain *rd)
 	if (!rd->n_reg_rules)
 		return false;
 
+	if (WARN_ON(rd->n_reg_rules > NL80211_MAX_SUPP_REG_RULES))
+		return false;
+
 	for (i = 0; i < rd->n_reg_rules; i++) {
 		reg_rule = &rd->reg_rules[i];
 		if (!is_valid_reg_rule(reg_rule))