[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20210622152502.EF713C4360C@smtp.codeaurora.org>
Date: Tue, 22 Jun 2021 15:25:02 +0000 (UTC)
From: Kalle Valo <kvalo@...eaurora.org>
To: Kees Cook <keescook@...omium.org>
Cc: Kees Cook <keescook@...omium.org>,
Amitkumar Karwar <amitkarwar@...il.com>,
Ganapathi Bhat <ganapathi017@...il.com>,
Sharvari Harisangam <sharvari.harisangam@....com>,
Xinming Hu <huxinming820@...il.com>,
"David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>, linux-kernel@...r.kernel.org,
linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
linux-hardening@...r.kernel.org
Subject: Re: [PATCH] mwifiex: Avoid memset() over-write of WEP key_material
Kees Cook <keescook@...omium.org> wrote:
> In preparation for FORTIFY_SOURCE performing compile-time and run-time
> field bounds checking for memset(), avoid intentionally writing across
> neighboring array fields.
>
> When preparing to call mwifiex_set_keyparamset_wep(), key_material is
> treated very differently from its structure layout (which has only a
> single struct mwifiex_ie_type_key_param_set). Instead, add a new type to
> the union so memset() can correctly reason about the size of the
> structure.
>
> Note that the union ("params", 196 bytes) containing key_material was
> not large enough to hold the target of this memset(): sizeof(struct
> mwifiex_ie_type_key_param_set) == 60, NUM_WEP_KEYS = 4, so 240
> bytes, or 44 bytes past the end of "params". The good news is that
> it appears that the command buffer, as allocated, is 2048 bytes
> (MWIFIEX_SIZE_OF_CMD_BUFFER), so no neighboring memory appears to be
> getting clobbered.
>
> Signed-off-by: Kees Cook <keescook@...omium.org>
> Reviewed-by: Brian Norris <briannorris@...omium.org>
Patch applied to wireless-drivers-next.git, thanks.
59c668d700be mwifiex: Avoid memset() over-write of WEP key_material
--
https://patchwork.kernel.org/project/linux-wireless/patch/20210617171522.3410951-1-keescook@chromium.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Powered by blists - more mailing lists