From: Maya Erez <merez@codeaurora.org>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: Alexei Avshalom Lazar <ailizaro@codeaurora.org>,
linux-wireless@vger.kernel.org, wil6210@qti.qualcomm.com,
Maya Erez <merez@codeaurora.org>
Subject: [PATCH 10/12] wil6210: check null pointer in _wil_cfg80211_merge_extra_ies
Date: Sun, 2 Dec 2018 11:43:35 +0200 [thread overview]
Message-ID: <1543743817-10298-11-git-send-email-merez@codeaurora.org> (raw)
In-Reply-To: <1543743817-10298-1-git-send-email-merez@codeaurora.org>
From: Alexei Avshalom Lazar <ailizaro@codeaurora.org>
ies1 or ies2 might be null when code inside
_wil_cfg80211_merge_extra_ies access them.
Add explicit check for null and make sure ies1/ies2 are not accessed in
such a case.
spos might be null and be accessed inside _wil_cfg80211_merge_extra_ies.
Add explicit check for null in the while condition statement and make
sure spos is not accessed in such a case.
Signed-off-by: Alexei Avshalom Lazar <ailizaro@codeaurora.org>
Signed-off-by: Maya Erez <merez@codeaurora.org>
---
drivers/net/wireless/ath/wil6210/cfg80211.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index ad5ac7d..f3fa1a0 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -1576,6 +1576,12 @@ static int _wil_cfg80211_merge_extra_ies(const u8 *ies1, u16 ies1_len,
u8 *buf, *dpos;
const u8 *spos;
+ if (!ies1)
+ ies1_len = 0;
+
+ if (!ies2)
+ ies2_len = 0;
+
if (ies1_len == 0 && ies2_len == 0) {
*merged_ies = NULL;
*merged_len = 0;
@@ -1585,17 +1591,19 @@ static int _wil_cfg80211_merge_extra_ies(const u8 *ies1, u16 ies1_len,
buf = kmalloc(ies1_len + ies2_len, GFP_KERNEL);
if (!buf)
return -ENOMEM;
- memcpy(buf, ies1, ies1_len);
+ if (ies1)
+ memcpy(buf, ies1, ies1_len);
dpos = buf + ies1_len;
spos = ies2;
- while (spos + 1 < ies2 + ies2_len) {
+ while (spos && (spos + 1 < ies2 + ies2_len)) {
/* IE tag at offset 0, length at offset 1 */
u16 ielen = 2 + spos[1];
if (spos + ielen > ies2 + ies2_len)
break;
if (spos[0] == WLAN_EID_VENDOR_SPECIFIC &&
- !_wil_cfg80211_find_ie(ies1, ies1_len, spos, ielen)) {
+ (!ies1 || !_wil_cfg80211_find_ie(ies1, ies1_len,
+ spos, ielen))) {
memcpy(dpos, spos, ielen);
dpos += ielen;
}
--
1.9.1
next prev parent reply other threads:[~2018-12-02 9:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-02 9:43 [PATCH 00/12] wil6210 patches Maya Erez
2018-12-02 9:43 ` [PATCH 01/12] wil6210: remove rtap_include_phy_info module param Maya Erez
2018-12-02 9:43 ` [PATCH 02/12] wil6210: use platform specific configuration Maya Erez
2018-12-02 9:43 ` [PATCH 03/12] wil6210: support ndo_select_queue in net_device_ops Maya Erez
2018-12-02 9:43 ` [PATCH 04/12] wil6210: add support for AC queues per station Maya Erez
2018-12-02 9:43 ` [PATCH 05/12] wil6210: add option to drop Tx packets when tx ring is full Maya Erez
2018-12-02 9:43 ` [PATCH 06/12] wil6210: support up to 20 stations in AP mode Maya Erez
2018-12-02 9:43 ` [PATCH 07/12] wil6210: accessing 802.3 addresses via utility functions Maya Erez
2018-12-02 9:43 ` [PATCH 08/12] wil6210: fix invalid sta statistics update Maya Erez
2018-12-02 9:43 ` [PATCH 09/12] wil6210: ignore HALP ICR if already handled Maya Erez
2018-12-02 9:43 ` Maya Erez [this message]
2018-12-02 9:43 ` [PATCH 11/12] wil6210: align to latest auto generated wmi.h Maya Erez
2018-12-02 9:43 ` [PATCH 12/12] wil6210: prevent device memory access while in reset or suspend Maya Erez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1543743817-10298-11-git-send-email-merez@codeaurora.org \
--to=merez@codeaurora.org \
--cc=ailizaro@codeaurora.org \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=wil6210@qti.qualcomm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).