]> Git Repo - linux.git/commitdiff
regulatory: add NUL to alpha2
authorEliad Peller <[email protected]>
Wed, 11 Jun 2014 07:23:35 +0000 (10:23 +0300)
committerJohannes Berg <[email protected]>
Fri, 15 Aug 2014 11:51:40 +0000 (13:51 +0200)
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.

Cc: [email protected]
Signed-off-by: Eliad Peller <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>
include/net/regulatory.h

index 259992444e80ae0b88eaec4ff345d23fd8f81c75..dad7ab20a8cb204f08b2ecda724d5c1db5138ec8 100644 (file)
@@ -167,7 +167,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[];
 };
This page took 0.055275 seconds and 4 git commands to generate.