summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2014-06-11 10:23:35 +0300
committerJohannes Berg <johannes.berg@intel.com>2014-08-15 13:51:40 +0200
commita5fe8e7695dc3f547e955ad2b662e3e72969e506 (patch)
tree77d69bf50907fb36473a6f3c341dc06802e27a66
parentc9d26423e56ce1ab4d786f92aebecf859d419293 (diff)
downloadop-kernel-dev-a5fe8e7695dc3f547e955ad2b662e3e72969e506.zip
op-kernel-dev-a5fe8e7695dc3f547e955ad2b662e3e72969e506.tar.gz
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>
-rw-r--r--include/net/regulatory.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 2599924..dad7ab2 100644
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -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[];
};
OpenPOWER on IntegriCloud