diff options
| author | Eliad Peller <eliad@wizery.com> | 2014-06-11 10:23:35 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-11-05 20:27:38 +0000 |
| commit | 6856061748aced168123cc77a8c16ada57825719 (patch) | |
| tree | 4f49a5b70ea744bbba68c318b2118b76386ffc0c /include | |
| parent | de9ba611731e25d18cdf634de785d2630e3e36c8 (diff) | |
| download | kernel_samsung_smdk4412-6856061748aced168123cc77a8c16ada57825719.zip kernel_samsung_smdk4412-6856061748aced168123cc77a8c16ada57825719.tar.gz kernel_samsung_smdk4412-6856061748aced168123cc77a8c16ada57825719.tar.bz2 | |
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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include')
| -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 eb7d3c2..c3c22e0 100644 --- a/include/net/regulatory.h +++ b/include/net/regulatory.h @@ -92,7 +92,7 @@ struct ieee80211_reg_rule { struct ieee80211_regdomain { u32 n_reg_rules; - char alpha2[2]; + char alpha2[3]; struct ieee80211_reg_rule reg_rules[]; }; |