Commit be93eea7 authored by Eliad Peller's avatar Eliad Peller Committed by Zefan Li

regulatory: add NUL to alpha2

commit a5fe8e76 upstream.

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.
Signed-off-by: default avatarEliad Peller <eliadx.peller@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
[lizf: Backported to 3.4: adjust context]
Signed-off-by: default avatarZefan Li <lizefan@huawei.com>
parent a51b4d77
...@@ -97,7 +97,7 @@ struct ieee80211_reg_rule { ...@@ -97,7 +97,7 @@ struct ieee80211_reg_rule {
struct ieee80211_regdomain { struct ieee80211_regdomain {
u32 n_reg_rules; u32 n_reg_rules;
char alpha2[2]; char alpha2[3];
u8 dfs_region; u8 dfs_region;
struct ieee80211_reg_rule reg_rules[]; struct ieee80211_reg_rule reg_rules[];
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment