AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

cfg80211: cleanup return calls on nl80211_set_reg()

Browse Source 
This has no functional change, but it will make the race
fix easier to spot in my next patch.

Cc: stable@kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis R. Rodriguez 2009-05-13 17:04:40 -04:00 committed by John W. Linville
parent 4776c6e7f6
commit d0e18f833d
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/wireless/nl80211.c
View File

@ -2570,15 +2570,19 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
return -EINVAL; return -EINVAL;
} }
if (!reg_is_valid_request(alpha2)) if (!reg_is_valid_request(alpha2)) {
return -EINVAL; r = -EINVAL;
goto bad_reg;
}
size_of_regd = sizeof(struct ieee80211_regdomain) + size_of_regd = sizeof(struct ieee80211_regdomain) +
(num_rules * sizeof(struct ieee80211_reg_rule)); (num_rules * sizeof(struct ieee80211_reg_rule));
rd = kzalloc(size_of_regd, GFP_KERNEL); rd = kzalloc(size_of_regd, GFP_KERNEL);
if (!rd) if (!rd) {
return -ENOMEM; r = -ENOMEM;
goto bad_reg;
}
rd->n_reg_rules = num_rules; rd->n_reg_rules = num_rules;
rd->alpha2[0] = alpha2[0]; rd->alpha2[0] = alpha2[0];
@ -2595,8 +2599,10 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
rule_idx++; rule_idx++;
if (rule_idx > NL80211_MAX_SUPP_REG_RULES) if (rule_idx > NL80211_MAX_SUPP_REG_RULES) {
r = -EINVAL;
goto bad_reg; goto bad_reg;
}
} }
BUG_ON(rule_idx != num_rules); BUG_ON(rule_idx != num_rules);
@ -2604,11 +2610,12 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
mutex_lock(&cfg80211_mutex); mutex_lock(&cfg80211_mutex);
r = set_regdom(rd); r = set_regdom(rd);
mutex_unlock(&cfg80211_mutex); mutex_unlock(&cfg80211_mutex);
return r; return r;
bad_reg: bad_reg:
kfree(rd); kfree(rd);
return -EINVAL; return r;
} }
static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info) static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)