Commit a5fe8e76 authored Jun 11, 2014 by Eliad Peller Committed by Johannes Berg Aug 15, 2014

regulatory: add NUL to alpha2



alpha2 is defined as 2-chars array, but is used in multiple
places as string (e.g. with nla_put_string calls), which
might leak kernel data.

Solve it by simply adding an extra char for the NULL
terminator, making such operations safe.

Cc: stable@vger.kernel.org
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent c9d26423

include/net/regulatory.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -167,7 +167,7 @@ struct ieee80211_reg_rule {
		struct ieee80211_regdomain {
		struct rcu_head rcu_head;
		u32 n_reg_rules;
		char alpha2[2];
		char alpha2[3];
		enum nl80211_dfs_regions dfs_region;
		struct ieee80211_reg_rule reg_rules[];
		};