Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

regulatory: add NUL to alpha2

Browse source 
commit a5fe8e7695 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>
This commit is contained in:
Eliad Peller 2014-06-11 10:23:35 +03:00 committed by Zefan Li
parent a51b4d7710
commit be93eea739
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/net/regulatory.h
View file

@ -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[];
}; };