From: Kees Cook <keescook@chromium.org>
To: Stephen Kitt <steve@sk2.org>
Cc: hare <hare@suse.com>,
linux-scsi@vger.kernel.org,
Kernel Hardening <kernel-hardening@lists.openwall.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] aic7xxx/aic79xx: remove VLAs
Date: Thu, 8 Mar 2018 11:52:25 -0800 [thread overview]
Message-ID: <CAGXu5jK=JhBFHBGpbWF46DC3-QMruiB0qqz1z+njcK2h7jVU9w@mail.gmail.com> (raw)
In-Reply-To: <20180308132225.13229-1-steve@sk2.org>
On Thu, Mar 8, 2018 at 5:22 AM, Stephen Kitt <steve@sk2.org> wrote:
> In preparation to enabling -Wvla, remove VLAs and replace them with
> fixed-length arrays instead.
>
> The arrays fixed here, using the number of constant sections, aren't
> really VLAs, but they appear so to the compiler. Since we know at
> build-time how many critical sections there are, we might as well use
> a pre-processor-level constant instead.
>
> This was prompted by https://lkml.org/lkml/2018/3/7/621
>
> Signed-off-by: Stephen Kitt <steve@sk2.org>
> ---
> drivers/scsi/aic7xxx/aic79xx_core.c | 8 ++++----
> drivers/scsi/aic7xxx/aic79xx_seq.h_shipped | 3 +--
> drivers/scsi/aic7xxx/aic7xxx_core.c | 8 ++++----
> drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped | 3 +--
> drivers/scsi/aic7xxx/aicasm/aicasm.c | 6 ++++--
> 5 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
> index b560f396ee99..034f4eebb160 100644
> --- a/drivers/scsi/aic7xxx/aic79xx_core.c
> +++ b/drivers/scsi/aic7xxx/aic79xx_core.c
> @@ -9338,9 +9338,9 @@ ahd_dumpseq(struct ahd_softc* ahd)
> static void
> ahd_loadseq(struct ahd_softc *ahd)
> {
> - struct cs cs_table[num_critical_sections];
> - u_int begin_set[num_critical_sections];
> - u_int end_set[num_critical_sections];
> + struct cs cs_table[NUM_CRITICAL_SECTIONS];
> + u_int begin_set[NUM_CRITICAL_SECTIONS];
> + u_int end_set[NUM_CRITICAL_SECTIONS];
> const struct patch *cur_patch;
> u_int cs_count;
> u_int cur_cs;
> @@ -9456,7 +9456,7 @@ ahd_loadseq(struct ahd_softc *ahd)
> * Move through the CS table until we find a CS
> * that might apply to this instruction.
> */
> - for (; cur_cs < num_critical_sections; cur_cs++) {
> + for (; cur_cs < NUM_CRITICAL_SECTIONS; cur_cs++) {
> if (critical_sections[cur_cs].end <= i) {
> if (begin_set[cs_count] == TRUE
> && end_set[cs_count] == FALSE) {
> diff --git a/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped b/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped
> index 4b51e232392f..20fb9ca9e271 100644
> --- a/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped
> +++ b/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped
> @@ -1186,5 +1186,4 @@ static const struct cs {
> { 759, 763 }
> };
>
> -static const int num_critical_sections = sizeof(critical_sections)
> - / sizeof(*critical_sections);
> +#define NUM_CRITICAL_SECTIONS 14
The compiler doesn't treat "const" as a literal, hence the need to
change this. However, you can still use the sizeof (actually, this is
exactly ARRAY_SIZE()). Perhaps:
#define NUM_CRITICAL_SECTIONS ARRAY_SIZE(critical_sections)
?
Otherwise, looks great!
-Kees
--
Kees Cook
Pixel Security
next prev parent reply other threads:[~2018-03-08 19:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-08 13:22 [PATCH] aic7xxx/aic79xx: remove VLAs Stephen Kitt
2018-03-08 19:52 ` Kees Cook [this message]
2018-03-08 20:50 ` Stephen Kitt
2018-03-08 20:51 ` [PATCH v2] " Stephen Kitt
2018-03-08 21:04 ` Kees Cook
2018-03-15 4:35 ` Martin K. Petersen
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='CAGXu5jK=JhBFHBGpbWF46DC3-QMruiB0qqz1z+njcK2h7jVU9w@mail.gmail.com' \
--to=keescook@chromium.org \
--cc=hare@suse.com \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=steve@sk2.org \
/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).