Skip to content

Commit

Permalink
regulatory: don't allocate too much memory
Browse files Browse the repository at this point in the history
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: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Johannes Berg committed Jan 3, 2013
1 parent 8a57fff commit 82f2085
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions net/wireless/reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 82f2085

Please sign in to comment.