Commit 82f20856 authored by Johannes Berg's avatar Johannes Berg
Browse files

regulatory: don't allocate too much memory 



There's no need to allocate one reg rule more
than will be used, reduce the allocations. The
allocation in nl80211 already doesn't allocate
too much space.

Acked-by: default avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8a57fff0

net/wireless/reg.c

+4 −3
Original line number Diff line number Diff line
@@ -318,8 +318,9 @@ static int reg_copy_regd(const struct ieee80211_regdomain **dst_regd, 
	int size_of_regd = 0;

	unsigned int i;



	size_of_regd = sizeof(struct ieee80211_regdomain) +

	  ((src_regd->n_reg_rules + 1) * sizeof(struct ieee80211_reg_rule));

	size_of_regd =

		sizeof(struct ieee80211_regdomain) +

		src_regd->n_reg_rules * sizeof(struct ieee80211_reg_rule);



	regd = kzalloc(size_of_regd, GFP_KERNEL);

	if (!regd)
@@ -641,7 +642,7 @@ static struct ieee80211_regdomain *regdom_intersect( 
		return NULL;



	size_of_regd = sizeof(struct ieee80211_regdomain) +

		((num_rules + 1) * sizeof(struct ieee80211_reg_rule));

		       num_rules * sizeof(struct ieee80211_reg_rule);



	rd = kzalloc(size_of_regd, GFP_KERNEL);

	if (!rd)