Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5875755c authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211_hwsim: fix check for custom world regdom array size 



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: default avatarDavid Binderman <dcb314@hotmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8d819a92

drivers/net/wireless/mac80211_hwsim.c

+4 −4
Original line number Diff line number Diff line
@@ -2150,14 +2150,14 @@ static int append_radio_msg(struct sk_buff *skb, int id, 
	if (param->regd) {

		int i;



		for (i = 0; hwsim_world_regdom_custom[i] != param->regd &&

		     i < ARRAY_SIZE(hwsim_world_regdom_custom); i++)

			;

		for (i = 0; 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);

			if (ret < 0)

				return ret;

			break;

		}

	}