| From foo@baz Sun May 27 17:33:38 CEST 2018 |
| From: Johannes Berg <johannes.berg@intel.com> |
| Date: Thu, 22 Feb 2018 20:55:28 +0100 |
| Subject: regulatory: add NUL to request alpha2 |
| |
| From: Johannes Berg <johannes.berg@intel.com> |
| |
| [ 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> |
| --- |
| include/net/regulatory.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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; |
