regulatory: add NUL to request alpha2
authorJohannes Berg <johannes.berg@intel.com>
Thu, 22 Feb 2018 19:55:28 +0000 (20:55 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 31 May 2018 23:30:18 +0000 (00:30 +0100)
commitb326f1bab0cd46b62d48074b95367698965e4d14
tree39ba7d3fd69090502f7a01668bc1829a716f2f66
parent53e4051f34a4fd8b56a8b98cce38610bf2257a0a
regulatory: add NUL to request alpha2

commit 657308f73e674e86b60509a430a46e569bf02846 upstream.

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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
include/net/regulatory.h