diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-23 11:50:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-23 11:50:05 -0400 |
| commit | 419fc888e5396968620bb8f85beb7ab55293f04f (patch) | |
| tree | c44c932e7c2e04b831302b8cacae9b7679ec8161 /net/wireless/reg.c | |
| parent | d7db318651d5430eb79eceef1e6aa9b084ae78e6 (diff) | |
| parent | fed4825096cfbbfd654cb292ab6eb193911aef01 (diff) | |
Merge tag 'mac80211-for-davem-2018-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A handful of fixes:
* hwsim radio dump wasn't working for the first radio
* mesh was updating statistics incorrectly
* a netlink message allocation was possibly too short
* wiphy name limit was still too long
* in certain cases regdb query could find a NULL pointer
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/reg.c')
| -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); |