diff options
| author | Eliad Peller <eliad@wizery.com> | 2014-06-11 10:23:35 +0300 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2014-12-01 18:02:22 +0800 |
| commit | be93eea739598a5bf2562110323d79d80d0e6a33 (patch) | |
| tree | 58479ef6306aea7696730678edfe87d6523ed4e5 | |
| parent | a51b4d7710d1a3593c3bdc4592fdecbbb8df4f16 (diff) | |
regulatory: add NUL to alpha2
commit a5fe8e7695dc3f547e955ad2b662e3e72969e506 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: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
[lizf: Backported to 3.4: adjust context]
Signed-off-by: Zefan Li <lizefan@huawei.com>
| -rw-r--r-- | include/net/regulatory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/regulatory.h b/include/net/regulatory.h index a5f79933e211..8d64abfcaac2 100644 --- a/include/net/regulatory.h +++ b/include/net/regulatory.h @@ -97,7 +97,7 @@ struct ieee80211_reg_rule { struct ieee80211_regdomain { u32 n_reg_rules; - char alpha2[2]; + char alpha2[3]; u8 dfs_region; struct ieee80211_reg_rule reg_rules[]; }; |