diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-22 07:40:22 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-22 07:40:21 -0700 |
| commit | a367cb43e424076820fa5dc09d45f794d3d84837 (patch) | |
| tree | ea709d34dd8be77997bc8d4317d49cc8ed5e11bb | |
| parent | b944e8d1e62adf39641051fcd7d407c2c8186e81 (diff) | |
| parent | 7041944896ef093eb414cfc6cd9bd5540fefbff3 (diff) | |
Merge "wil6210: protect against invalid length of tx management frame"
| -rw-r--r-- | drivers/net/wireless/ath/wil6210/cfg80211.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/wil6210/debugfs.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c index e07b120f791f..63bb7686b811 100644 --- a/drivers/net/wireless/ath/wil6210/cfg80211.c +++ b/drivers/net/wireless/ath/wil6210/cfg80211.c @@ -960,6 +960,9 @@ int wil_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, wil_hex_dump_misc("mgmt tx frame ", DUMP_PREFIX_OFFSET, 16, 1, buf, len, true); + if (len < sizeof(struct ieee80211_mgmt)) + return -EINVAL; + cmd = kmalloc(sizeof(*cmd) + len, GFP_KERNEL); if (!cmd) { rc = -ENOMEM; diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c index d3691c64d47a..6eefb9e61ec4 100644 --- a/drivers/net/wireless/ath/wil6210/debugfs.c +++ b/drivers/net/wireless/ath/wil6210/debugfs.c @@ -805,8 +805,12 @@ static ssize_t wil_write_file_txmgmt(struct file *file, const char __user *buf, struct wireless_dev *wdev = wil_to_wdev(wil); struct cfg80211_mgmt_tx_params params; int rc; - void *frame = kmalloc(len, GFP_KERNEL); + void *frame; + if (!len) + return -EINVAL; + + frame = kmalloc(len, GFP_KERNEL); if (!frame) return -ENOMEM; |