From: Ben Hutchings <bhutchings@solarflare.com>
To: Tim Gardner <tim.gardner@canonical.com>
Cc: <Larry.Finger@lwfinger.net>,
Chaoming Li <chaoming_li@realsil.com.cn>,
"John W. Linville" <linville@tuxdriver.com>,
<linux-wireless@vger.kernel.org>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] rtlwifi: rtl8192se firmware load can overflow target buffer
Date: Wed, 8 Feb 2012 21:45:14 +0000 [thread overview]
Message-ID: <1328737514.2627.14.camel@bwh-desktop> (raw)
In-Reply-To: <1328735291-33220-1-git-send-email-tim.gardner@canonical.com>
On Wed, 2012-02-08 at 14:08 -0700, Tim Gardner wrote:
> The firmware file size check does not use the
> correct limit.
>
> Cc: Larry Finger <Larry.Finger@lwfinger.net>
> Cc: Chaoming Li <chaoming_li@realsil.com.cn>
> Cc: John W. Linville <linville@tuxdriver.com>
> Cc: linux-wireless@vger.kernel.org
> Cc: netdev@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
> drivers/net/wireless/rtlwifi/rtl8192se/fw.h | 3 ++-
> drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 2 +-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
> index babe85d..5c377fc 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
> +++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
> @@ -30,6 +30,7 @@
> #define __REALTEK_FIRMWARE92S_H__
>
> #define RTL8190_MAX_FIRMWARE_CODE_SIZE 64000
> +#define RTL8190_MAX_RAW_FIRMWARE_CODE_SIZE 164000
> #define RTL8190_CPU_START_OFFSET 0x80
> /* Firmware Local buffer size. 64k */
> #define MAX_FIRMWARE_CODE_SIZE 0xFF00
> @@ -217,7 +218,7 @@ struct rt_firmware {
> u8 fw_emem[RTL8190_MAX_FIRMWARE_CODE_SIZE];
> u32 fw_imem_len;
> u32 fw_emem_len;
> - u8 sz_fw_tmpbuffer[164000];
> + u8 sz_fw_tmpbuffer[RTL8190_MAX_RAW_FIRMWARE_CODE_SIZE];
> u32 sz_fw_tmpbufferlen;
> u16 cmdpacket_fragthresold;
> };
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
> index ca38dd9..155da0a 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
> @@ -105,7 +105,7 @@ static void rtl92se_fw_cb(const struct firmware *firmware, void *context)
> rtlpriv->max_fw_size = 0;
> return;
> }
> - if (firmware->size > rtlpriv->max_fw_size) {
> + if (firmware->size >= RTL8190_MAX_RAW_FIRMWARE_CODE_SIZE) {
This appears to reject a firmware blob which is exactly the maximum
size, which looks wrong. Also doesn't this make the max_fw_size field
redundant?
Ben.
> RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
> "Firmware is too big!\n");
> release_firmware(firmware);
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
next prev parent reply other threads:[~2012-02-08 21:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-08 21:08 [PATCH] rtlwifi: rtl8192se firmware load can overflow target buffer Tim Gardner
2012-02-08 21:45 ` Ben Hutchings [this message]
2012-02-09 0:55 ` Larry Finger
2012-02-09 2:30 ` Larry Finger
2012-02-09 14:41 ` Tim Gardner
2012-02-09 16:43 ` Larry Finger
2012-02-09 17:25 ` [PATCH v3] " Tim Gardner
2012-02-10 0:21 ` Larry Finger
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=1328737514.2627.14.camel@bwh-desktop \
--to=bhutchings@solarflare.com \
--cc=Larry.Finger@lwfinger.net \
--cc=chaoming_li@realsil.com.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
--cc=tim.gardner@canonical.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).