diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2018-02-22 20:55:28 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-30 07:47:35 +0200 |
| commit | 85dc640cb86720ee469301d5a4f0874ff173e6e2 (patch) | |
| tree | a3d82dbf4a641af109356a889d12e18a1f5946de /include | |
| parent | 9fac7f80cc318c61b499bd4870172a6055b26a61 (diff) | |
| download | linux-stable-85dc640cb86720ee469301d5a4f0874ff173e6e2.tar.gz linux-stable-85dc640cb86720ee469301d5a4f0874ff173e6e2.tar.bz2 linux-stable-85dc640cb86720ee469301d5a4f0874ff173e6e2.zip | |
regulatory: add NUL to request alpha2
[ Upstream commit 657308f73e674e86b60509a430a46e569bf02846 ]
Similar to the ancient commit a5fe8e7695dc ("regulatory: add NUL
to alpha2"), add another byte to alpha2 in the request struct so
that when we use nla_put_string(), we don't overrun anything.
Fixes: 73d54c9e74c4 ("cfg80211: add regulatory netlink multicast group")
Reported-by: Kees Cook <keescook@google.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.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 dad7ab20a8cb..c95dcba0aa94 100644 --- a/include/net/regulatory.h +++ b/include/net/regulatory.h @@ -78,7 +78,7 @@ struct regulatory_request { int wiphy_idx; enum nl80211_reg_initiator initiator; enum nl80211_user_reg_hint_type user_reg_hint_type; - char alpha2[2]; + char alpha2[3]; enum nl80211_dfs_regions dfs_region; bool intersect; bool processed; |