From: Kalle Valo <kvalo@codeaurora.org>
To: "Tobin C. Harding" <me@tobin.cc>
Cc: "Tobin C. Harding" <me@tobin.cc>,
kernel-hardening@lists.openwall.com,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
linux-wireless@vger.kernel.org, Tycho Andersen <tycho@tycho.ws>,
Kees Cook <keescook@chromium.org>
Subject: Re: [RESEND] rsi: Remove stack VLA usage
Date: Tue, 13 Mar 2018 16:52:07 +0000 (UTC) [thread overview]
Message-ID: <20180313165207.BB0FE600C1@smtp.codeaurora.org> (raw)
In-Reply-To: <1520819022-15238-1-git-send-email-me@tobin.cc>
"Tobin C. Harding" <me@tobin.cc> wrote:
> The kernel would like to have all stack VLA usage removed[1]. rsi uses
> a VLA based on 'blksize'. Elsewhere in the SDIO code maximum block size
> is defined using a magic number. We can use a pre-processor defined
> constant and declare the array to maximum size. We add a check before
> accessing the array in case of programmer error.
>
> [1]: https://lkml.org/lkml/2018/3/7/621
>
> Signed-off-by: Tobin C. Harding <me@tobin.cc>
There were conflicts. Can you rebase on top of wireless-drivers-next and
resend, please?
Recorded preimage for 'drivers/net/wireless/rsi/rsi_91x_sdio.c'
error: Failed to merge in the changes.
Applying: rsi: Remove stack VLA usage
Using index info to reconstruct a base tree...
M drivers/net/wireless/rsi/rsi_91x_hal.c
M drivers/net/wireless/rsi/rsi_91x_sdio.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/rsi/rsi_91x_sdio.c
CONFLICT (content): Merge conflict in drivers/net/wireless/rsi/rsi_91x_sdio.c
Auto-merging drivers/net/wireless/rsi/rsi_91x_hal.c
Patch failed at 0001 rsi: Remove stack VLA usage
The copy of the patch that failed is found in: .git/rebase-apply/patch
Patch set to Changes Requested.
--
https://patchwork.kernel.org/patch/10274983/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2018-03-13 16:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-12 1:43 [RESEND PATCH] rsi: Remove stack VLA usage Tobin C. Harding
2018-03-12 2:06 ` Larry Finger
2018-03-13 20:09 ` Tobin C. Harding
2018-03-12 9:46 ` [RESEND] " Kalle Valo
2018-03-12 9:46 ` Kalle Valo
2018-03-13 16:52 ` Kalle Valo [this message]
2018-03-13 16:52 ` Kalle Valo
[not found] ` <20180312094606.8192B6081A@smtp.codeaurora.org>
2018-03-13 20:17 ` tcharding
2018-03-13 21:00 ` Andy Shevchenko
2018-03-14 2:11 ` Tobin C. Harding
2018-03-14 2:53 ` Kees Cook
2018-03-14 3:43 ` Tobin C. Harding
2018-03-14 9:19 ` Kalle Valo
2018-03-14 20:19 ` Tobin C. Harding
2018-03-15 9:07 ` Kalle Valo
2018-03-14 9:11 ` Kalle Valo
2018-03-14 9:05 ` 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=20180313165207.BB0FE600C1@smtp.codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=me@tobin.cc \
--cc=netdev@vger.kernel.org \
--cc=tycho@tycho.ws \
/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).