diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2018-02-22 20:55:28 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-02-22 20:57:48 +0100 |
| commit | 657308f73e674e86b60509a430a46e569bf02846 (patch) | |
| tree | a0fc7a96e2f90ad33f583bc737066757b16dc028 /include | |
| parent | mac80211: Fix sending ADDBA response for an ongoing session (diff) | |
| download | linux-dev-657308f73e674e86b60509a430a46e569bf02846.tar.xz linux-dev-657308f73e674e86b60509a430a46e569bf02846.zip | |
regulatory: add NUL to request alpha2
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>
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 ebc5a2ed8631..f83cacce3308 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; |