diff options
| author | Haim Dreyfuss <haim.dreyfuss@intel.com> | 2018-05-21 22:34:57 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-05-22 10:17:52 +0200 |
| commit | 5247a77ced2d3396a32679c7480e8bcd5b26e471 (patch) | |
| tree | 7b1dc7be25d50bc45771666044fad90ed6ff0150 /net | |
| parent | mac80211: mesh: fix premature update of rc stats (diff) | |
| download | linux-5247a77ced2d3396a32679c7480e8bcd5b26e471.tar.xz linux-5247a77ced2d3396a32679c7480e8bcd5b26e471.zip | |
cfg80211: fix NULL pointer derference when querying regdb
Some drivers may call this function when regdb is not initialized yet,
so we need to make sure regdb is valid before trying to access it.
Make sure regdb is initialized before trying to access it in
reg_query_regdb_wmm() and query_regdb().
Reported-by: Eric Biggers <ebiggers3@gmail.com>
Signed-off-by: Haim Dreyfuss <haim.dreyfuss@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/reg.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index ac3e12c32aa3..5fcec5c94eb7 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -916,6 +916,9 @@ int reg_query_regdb_wmm(char *alpha2, int freq, u32 *dbptr, const struct fwdb_header *hdr = regdb; const struct fwdb_country *country; + if (!regdb) + return -ENODATA; + if (IS_ERR(regdb)) return PTR_ERR(regdb); |