linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Julian Calaby <julian.calaby@gmail.com>
To: Xiaohui Zhang <ruc_zhangxiaohui@163.com>
Cc: Amitkumar Karwar <amitkarwar@gmail.com>,
	Ganapathi Bhat <ganapathi.bhat@nxp.com>,
	Xinming Hu <huxinming820@gmail.com>,
	Kalle Valo <kvalo@codeaurora.org>,
	"David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
	LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/1] mwifiex: Fix possible buffer overflows in mwifiex_config_scan
Date: Wed, 9 Dec 2020 11:36:05 +1100	[thread overview]
Message-ID: <CAGRGNgWzTnmyYO97MkW+biQBrs-LarknCAsM9q+-UMqcSCN3bQ@mail.gmail.com> (raw)
In-Reply-To: <20201208124523.8169-1-ruc_zhangxiaohui@163.com>

Hi Xiaohui,

On Wed, Dec 9, 2020 at 12:07 AM Xiaohui Zhang <ruc_zhangxiaohui@163.com> wrote:
>
> From: Zhang Xiaohui <ruc_zhangxiaohui@163.com>
>
> mwifiex_config_scan() calls memcpy() without checking
> the destination size may trigger a buffer overflower,
> which a local user could use to cause denial of service
> or the execution of arbitrary code.
> Fix it by putting the length check before calling memcpy().
>
> Signed-off-by: Zhang Xiaohui <ruc_zhangxiaohui@163.com>
> ---
>  drivers/net/wireless/marvell/mwifiex/scan.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
> index c2a685f63..b1d90678f 100644
> --- a/drivers/net/wireless/marvell/mwifiex/scan.c
> +++ b/drivers/net/wireless/marvell/mwifiex/scan.c
> @@ -930,6 +930,8 @@ mwifiex_config_scan(struct mwifiex_private *priv,
>                                     "DIRECT-", 7))
>                                 wildcard_ssid_tlv->max_ssid_length = 0xfe;
>
> +                       if (ssid_len > 1)
> +                               ssid_len = 1;
>                         memcpy(wildcard_ssid_tlv->ssid,
>                                user_scan_in->ssid_list[i].ssid, ssid_len);

Can ssid_len ever be 0 here?

If it can't, should we just set ssid_len to 1 unconditionally?

If it can, should we just skip the memcpy as it won't do anything?

Thanks,

-- 
Julian Calaby

Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/

  parent reply	other threads:[~2020-12-09  0:37 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-08 12:45 [PATCH 1/1] mwifiex: Fix possible buffer overflows in mwifiex_config_scan Xiaohui Zhang
2020-12-08 14:29 ` Kalle Valo
2020-12-09  0:36 ` Julian Calaby [this message]
2021-01-09 15:08 ` Peter Seiderer
2021-01-11 18:51   ` Brian Norris
2020-12-08 15:09 Xiaohui Zhang
2020-12-08 19:12 ` Brian Norris
2020-12-17 16:28   ` Kalle Valo

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=CAGRGNgWzTnmyYO97MkW+biQBrs-LarknCAsM9q+-UMqcSCN3bQ@mail.gmail.com \
    --to=julian.calaby@gmail.com \
    --cc=amitkarwar@gmail.com \
    --cc=davem@davemloft.net \
    --cc=ganapathi.bhat@nxp.com \
    --cc=huxinming820@gmail.com \
    --cc=kuba@kernel.org \
    --cc=kvalo@codeaurora.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=ruc_zhangxiaohui@163.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).