Date: Tue, 13 Mar 2018 16:52:07 +0000 (UTC) From: Kalle Valo <kvalo@...eaurora.org> To: "Tobin C. Harding" <me@...in.cc> Cc: "Tobin C. Harding" <me@...in.cc>, kernel-hardening@...ts.openwall.com, linux-kernel@...r.kernel.org, netdev@...r.kernel.org, linux-wireless@...r.kernel.org, Tycho Andersen <tycho@...ho.ws>, Kees Cook <keescook@...omium.org> Subject: Re: [RESEND] rsi: Remove stack VLA usage "Tobin C. Harding" <me@...in.cc> wrote: > The kernel would like to have all stack VLA usage removed. 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. > > : https://lkml.org/lkml/2018/3/7/621 > > Signed-off-by: Tobin C. Harding <me@...in.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
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.