diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-11 00:34:50 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-11 00:34:50 +0300 |
| commit | b2a9643855c320353723a08b9ee4a3bbd0301c1a (patch) | |
| tree | 61cacf2ff831c2eb1cb6b28686a8864540b7c86d /net/wireless/core.c | |
| parent | 09c8b9718a7af674036643fa2e0dbb2f09aba75e (diff) | |
| parent | 914eac248d876f9c00cd1792ffec3d182c863f13 (diff) | |
| download | linux-b2a9643855c320353723a08b9ee4a3bbd0301c1a.tar.xz | |
Merge tag 'mac80211-for-davem-2018-05-09' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
We only have a few fixes this time:
* WMM element validation
* SAE timeout
* add-BA timeout
* docbook parsing
* a few memory leaks in error paths
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index a6f3cac8c640..c0fd8a85e7f7 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -95,6 +95,9 @@ static int cfg80211_dev_check_name(struct cfg80211_registered_device *rdev, ASSERT_RTNL(); + if (strlen(newname) > NL80211_WIPHY_NAME_MAXLEN) + return -EINVAL; + /* prohibit calling the thing phy%d when %d is not its number */ sscanf(newname, PHY_NAME "%d%n", &wiphy_idx, &taken); if (taken == strlen(newname) && wiphy_idx != rdev->wiphy_idx) { |