public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mac80211_hwsim: fix check for custom world regdom array size

Browse source 
David Binderman reports that the conditions in the first loop
are the wrong way around - checking the array contents before
the size.

Instead of leaving the empty loop there and reordering the two
checks unify it into a single loop that skips over non-matches
and exits after the first match.

Reported-by: David Binderman <dcb314@hotmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2014-12-22 12:51:25 +01:00
parent 8d819a92cc
commit 5875755c57
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/wireless/mac80211_hwsim.c
View file

@ -2150,14 +2150,14 @@ static int append_radio_msg(struct sk_buff *skb, int id,
if (param->regd) { if (param->regd) {
int i; int i;
for (i = 0; hwsim_world_regdom_custom[i] != param->regd && for (i = 0; i < ARRAY_SIZE(hwsim_world_regdom_custom); i++) {
i < ARRAY_SIZE(hwsim_world_regdom_custom); i++) if (hwsim_world_regdom_custom[i] != param->regd)
; continue;
if (i < ARRAY_SIZE(hwsim_world_regdom_custom)) {
ret = nla_put_u32(skb, HWSIM_ATTR_REG_CUSTOM_REG, i); ret = nla_put_u32(skb, HWSIM_ATTR_REG_CUSTOM_REG, i);
if (ret < 0) if (ret < 0)
return ret; return ret;
break;
} }
} }