LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Wenlong Zhang <yixiaonn@gmail.com>
To: gregkh@linuxfoundation.org
Cc: fabioaiuto83@gmail.com, ross.schm.dev@gmail.com,
	marcocesati@gmail.com, insafonov@gmail.com, cyruscyliu@gmail.com,
	yajin@vm-kernel.org, linux-kernel@vger.kernel.org,
	linux-staging@lists.linux.dev, Wenlong Zhang <yixiaonn@gmail.com>
Subject: [PATCH] staging: rtl8723bs: prevent ->ssid overflow in rtw_wx_set_scan()
Date: Thu, 26 Aug 2021 23:46:22 +0800	[thread overview]
Message-ID: <20210826154622.55361-1-yixiaonn@gmail.com> (raw)

Commit 74b6b20df8cf ("staging: rtl8188eu: prevent ->ssid overflow in rtw_wx_set_scan()")
fixed up the staging driver rtl8188eu by adding another check 
to prevent writing beyond the end of the ->ssid[] array.

Resolve this by properly fixing up the rtl8723bs driver's version of
rtw_wx_set_scan() 

Reported-by: Wenlong Zhang(iLifetruth) <yixiaonn@gmail.com>
Fixes: 74b6b20df8cf ("staging: rtl8188eu: prevent ->ssid overflow in rtw_wx_set_scan()")

Signed-off-by: Wenlong Zhang <yixiaonn@gmail.com>

---
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index 902ac8169948..6fc1020cea11 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -1351,9 +1351,9 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
 
 					sec_len = *(pos++); len -= 1;
 
-					if (sec_len > 0 && sec_len <= len) {
+					if (sec_len > 0 && sec_len <= len && sec_len <= 32) {
 						ssid[ssid_index].SsidLength = sec_len;
-						memcpy(ssid[ssid_index].Ssid, pos, ssid[ssid_index].SsidLength);
+						memcpy(ssid[ssid_index].Ssid, pos, sec_len);
 						/* DBG_871X("%s COMBO_SCAN with specific ssid:%s, %d\n", __func__ */
 						/* 	, ssid[ssid_index].Ssid, ssid[ssid_index].SsidLength); */
 						ssid_index++;
-- 
2.15.0


             reply	other threads:[~2021-08-26 15:46 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-26 15:46 Wenlong Zhang [this message]
2021-08-26 16:59 ` Dan Carpenter
2021-08-26 17:19 ` Fabio Aiuto
2021-08-26 17:26 ` Fabio Aiuto
2021-08-26 18:16   ` Dan Carpenter
2021-08-27  6:46     ` Fabio Aiuto
2021-08-26 18:55 ` Greg KH
2021-08-27  9:00   ` [PATCH v2] " Wenlong Zhang
2021-08-27  9:47     ` Greg KH
2021-08-27 12:50   ` [PATCH v3] " Wenlong Zhang
2021-08-27 13:06     ` Dan Carpenter
2021-08-27 13:10     ` Greg KH

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=20210826154622.55361-1-yixiaonn@gmail.com \
    --to=yixiaonn@gmail.com \
    --cc=cyruscyliu@gmail.com \
    --cc=fabioaiuto83@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=insafonov@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=marcocesati@gmail.com \
    --cc=ross.schm.dev@gmail.com \
    --cc=yajin@vm-kernel.org \
    --subject='Re: [PATCH] staging: rtl8723bs: prevent ->ssid overflow in rtw_wx_set_scan()' \
    /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

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).