From: Kalle Valo <kvalo@codeaurora.org>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Amitkumar Karwar <amitkarwar@gmail.com>,
Nishant Sarmukadam <nishants@marvell.com>,
Ganapathi Bhat <gbhat@marvell.com>, Xinming Hu <huxm@marvell.com>,
linux-wireless@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: mwifiex: pcie: tighten a check in mwifiex_pcie_process_event_ready()
Date: Wed, 25 Apr 2018 08:21:09 +0000 [thread overview]
Message-ID: <20180425082109.78ED5607E5@smtp.codeaurora.org> (raw)
In-Reply-To: <20180405111719.GB4218@mwanda>
Dan Carpenter <dan.carpenter@oracle.com> wrote:
> If "evt_len" is 1 then we try to memcpy() negative 3 bytes and it would
> cause memory corruption.
>
> Fixes: d930faee141b ("mwifiex: add support for Marvell pcie8766 chipset")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
> index 97a6199692ab..7538543d46fa 100644
> --- a/drivers/net/wireless/marvell/mwifiex/pcie.c
> +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
> @@ -1881,7 +1881,8 @@ static int mwifiex_pcie_process_event_ready(struct mwifiex_adapter *adapter)
> mwifiex_dbg(adapter, EVENT,
> "info: Event length: %d\n", evt_len);
>
> - if ((evt_len > 0) && (evt_len < MAX_EVENT_SIZE))
> + if (evt_len > MWIFIEX_EVENT_HEADER_LEN &&
> + evt_len < MAX_EVENT_SIZE)
> memcpy(adapter->event_body, skb_cmd->data +
> MWIFIEX_EVENT_HEADER_LEN, evt_len -
> MWIFIEX_EVENT_HEADER_LEN);
Patch applied to wireless-drivers-next.git, thanks.
01eca2842874 mwifiex: pcie: tighten a check in mwifiex_pcie_process_event_ready()
--
https://patchwork.kernel.org/patch/10324435/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
WARNING: multiple messages have this Message-ID (diff)
From: Kalle Valo <kvalo@codeaurora.org>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Amitkumar Karwar <amitkarwar@gmail.com>,
Nishant Sarmukadam <nishants@marvell.com>,
Ganapathi Bhat <gbhat@marvell.com>, Xinming Hu <huxm@marvell.com>,
linux-wireless@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: mwifiex: pcie: tighten a check in mwifiex_pcie_process_event_ready()
Date: Wed, 25 Apr 2018 08:21:09 +0000 (UTC) [thread overview]
Message-ID: <20180425082109.78ED5607E5@smtp.codeaurora.org> (raw)
In-Reply-To: <20180405111719.GB4218@mwanda>
Dan Carpenter <dan.carpenter@oracle.com> wrote:
> If "evt_len" is 1 then we try to memcpy() negative 3 bytes and it would
> cause memory corruption.
>
> Fixes: d930faee141b ("mwifiex: add support for Marvell pcie8766 chipset")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
> index 97a6199692ab..7538543d46fa 100644
> --- a/drivers/net/wireless/marvell/mwifiex/pcie.c
> +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
> @@ -1881,7 +1881,8 @@ static int mwifiex_pcie_process_event_ready(struct mwifiex_adapter *adapter)
> mwifiex_dbg(adapter, EVENT,
> "info: Event length: %d\n", evt_len);
>
> - if ((evt_len > 0) && (evt_len < MAX_EVENT_SIZE))
> + if (evt_len > MWIFIEX_EVENT_HEADER_LEN &&
> + evt_len < MAX_EVENT_SIZE)
> memcpy(adapter->event_body, skb_cmd->data +
> MWIFIEX_EVENT_HEADER_LEN, evt_len -
> MWIFIEX_EVENT_HEADER_LEN);
Patch applied to wireless-drivers-next.git, thanks.
01eca2842874 mwifiex: pcie: tighten a check in mwifiex_pcie_process_event_ready()
--
https://patchwork.kernel.org/patch/10324435/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2018-04-25 8:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-05 11:17 [PATCH] mwifiex: pcie: tighten a check in mwifiex_pcie_process_event_ready() Dan Carpenter
2018-04-05 11:17 ` Dan Carpenter
2018-04-25 8:21 ` Kalle Valo [this message]
2018-04-25 8:21 ` 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=20180425082109.78ED5607E5@smtp.codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=amitkarwar@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=gbhat@marvell.com \
--cc=huxm@marvell.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=nishants@marvell.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.