diff options
| author | Eliad Peller <eliad@wizery.com> | 2014-06-11 10:23:35 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-05 14:52:20 -0700 |
| commit | 14abd3ae920e0b1102e5320deaba374f13bde8ff (patch) | |
| tree | 08781904ae253465d8e370a2a31c58a58fbff3d6 /include | |
| parent | a43ff216853cfa92bd45e06c619a5c81af627e14 (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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 b07cdc9fa454..f103f30122a1 100644 --- a/include/net/regulatory.h +++ b/include/net/regulatory.h @@ -160,7 +160,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[]; }; |