From: Kees Cook <keescook@chromium.org>
To: Hans de Goede <hdegoede@redhat.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Mark Gross <markgross@kernel.org>,
Mark Pearson <markpearson@lenovo.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the kspp tree
Date: Wed, 9 Mar 2022 09:18:26 -0800 [thread overview]
Message-ID: <202203090918.A993715E6@keescook> (raw)
In-Reply-To: <0d4cdbbb-993b-55f3-355a-e0826ab45f46@redhat.com>
On Wed, Mar 09, 2022 at 05:58:56PM +0100, Hans de Goede wrote:
> Hi,
>
> On 3/9/22 17:52, Kees Cook wrote:
> > On Wed, Mar 09, 2022 at 09:10:29PM +1100, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> After merging the kspp tree, today's linux-next build (x86_64
> >> allmodconfig) failed like this:
> >>
> >> In file included from include/linux/bitops.h:33,
> >> from include/linux/kernel.h:22,
> >> from drivers/platform/x86/thinkpad_acpi.c:37:
> >> drivers/platform/x86/thinkpad_acpi.c: In function 'tpacpi_dytc_profile_init':
> >> arch/x86/include/asm/bitops.h:207:22: error: array subscript 'long unsigned int[0]' is partly outside array bounds of 'int[1]' [-Werror=array-bounds]
> >> 207 | (addr[nr >> _BITOPS_LONG_SHIFT])) != 0;
> >> | ~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~
> >> drivers/platform/x86/thinkpad_acpi.c:10385:18: note: while referencing 'output'
> >> 10385 | int err, output;
> >> | ^~~~~~
> >>
> >> Actually the test_bit() in line 10409.
> >>
> >> Caused by commit
> >>
> >> e1c21608e3cf ("platform/x86: thinkpad_acpi: Add PSC mode support")
> >>
> >> from the drivers-x86 tree interacting with the enablement of
> >> -Werror=array-bounds.
> >>
> >> I have reverted that commit for today.
>
> Thank you.
>
> > Looking at https://lore.kernel.org/all/20220225182505.7234-1-markpearson@lenovo.com/
> >
> > The problem is with the cast of "int output" to "unsigned long". Past
> > fixes have either made the variable unsigned long, or adding a new
> > variable and removal of casts. e.g. this pseudo-patch:
> >
> > + unsigned long bits;
> >
> > ...
> > + bits = output;
> > - if (test_bit(DYTC_FC_MMC, (void *)&output)) { /* MMC MODE */
> > + if (test_bit(DYTC_FC_MMC, &bits)) { /* MMC MODE */
> >
> > ...
> >
> > - } else if (test_bit(DYTC_FC_PSC, (void *)&output)) { /*PSC MODE */
> > + } else if (test_bit(DYTC_FC_PSC, &bits)) { /*PSC MODE */
>
> Right I was just preparing a patch for this, I've gone with:
>
> diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
> index 7016c7fc3440..c476a78599d6 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -10399,7 +10399,7 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)
> if (err)
> return err;
>
> - if (test_bit(DYTC_FC_MMC, (void *)&output)) { /* MMC MODE */
> + if (output & BIT(DYTC_FC_MMC)) { /* MMC MODE */
> dytc_profile_available = DYTC_FUNCMODE_MMC;
>
> /*
> @@ -10412,7 +10412,7 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)
> if (!err && ((output & DYTC_ERR_MASK) == DYTC_ERR_SUCCESS))
> dytc_mmc_get_available = true;
> }
> - } else if (test_bit(DYTC_FC_PSC, (void *)&output)) { /*PSC MODE */
> + } else if (output & BIT(DYTC_FC_PSC)) { /* PSC MODE */
> dytc_profile_available = DYTC_FUNCMODE_PSC;
> } else {
> dbg_printk(TPACPI_DBG_INIT, "No DYTC support available\n");
>
> I'll push this to the drivers-x86 tree for-next branch.
Ah yeah. Heh, that's much simpler. :)
--
Kees Cook
next prev parent reply other threads:[~2022-03-09 17:19 UTC|newest]
Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-09 10:10 linux-next: build failure after merge of the kspp tree Stephen Rothwell
2022-03-09 16:52 ` Kees Cook
2022-03-09 16:58 ` Hans de Goede
2022-03-09 17:18 ` Kees Cook [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-05 3:50 Stephen Rothwell
2024-03-05 9:54 ` Kees Cook
2023-09-14 1:50 Stephen Rothwell
2023-09-14 3:07 ` Kees Cook
2023-01-05 2:25 Stephen Rothwell
2023-01-05 3:22 ` Kees Cook
2023-01-05 4:24 ` Stephen Rothwell
2022-12-01 3:07 Stephen Rothwell
2022-12-01 16:31 ` Kees Cook
2022-07-28 10:55 Stephen Rothwell
2022-07-28 15:12 ` Matthias Kaehlcke
2022-05-05 7:40 Stephen Rothwell
2022-05-07 17:18 ` Kees Cook
2022-03-16 7:32 Stephen Rothwell
2022-03-17 1:01 ` Linus Walleij
2022-03-17 8:24 ` Marc Zyngier
2022-02-28 22:27 Stephen Rothwell
2022-02-28 23:02 ` Kees Cook
2022-03-02 9:16 ` Stephen Rothwell
2022-03-03 7:29 ` Stephen Rothwell
2022-01-30 23:09 Stephen Rothwell
2022-01-31 4:04 ` Kees Cook
2022-01-31 4:59 ` Stephen Rothwell
2022-01-31 6:19 ` Kees Cook
2022-01-31 19:10 ` Saeed Mahameed
2022-01-31 21:06 ` Kees Cook
2022-01-30 22:34 Stephen Rothwell
2022-01-30 23:24 ` Herbert Xu
2022-01-31 0:15 ` Stephen Rothwell
2022-01-31 0:20 ` Herbert Xu
2022-01-31 0:41 ` Stephen Rothwell
2022-01-25 3:50 Stephen Rothwell
2022-01-25 7:44 ` Kees Cook
2022-01-25 13:27 ` Masami Hiramatsu
2022-01-25 14:01 ` Steven Rostedt
2022-01-25 17:53 ` Kees Cook
2022-01-25 14:31 ` Masami Hiramatsu
2022-01-25 15:49 ` Steven Rostedt
2022-01-25 17:54 ` Kees Cook
2022-01-25 18:41 ` Steven Rostedt
2022-01-25 20:57 ` Kees Cook
2022-01-25 21:23 ` Steven Rostedt
2022-01-25 21:28 ` Steven Rostedt
2022-01-25 22:07 ` Kees Cook
2022-01-25 22:21 ` Steven Rostedt
2022-01-26 0:35 ` Masami Hiramatsu
2022-01-26 1:16 ` Steven Rostedt
2022-01-26 3:18 ` Kees Cook
2022-01-26 3:26 ` Steven Rostedt
2022-01-26 19:41 ` Beau Belgrave
2022-01-26 21:00 ` Steven Rostedt
2022-01-26 3:52 ` Masami Hiramatsu
2022-01-26 4:06 ` Steven Rostedt
2022-01-26 3:17 ` Kees Cook
2022-01-25 22:01 ` Kees Cook
2022-01-25 3:24 Stephen Rothwell
2022-01-25 3:43 ` Kees Cook
2022-02-08 4:42 ` Stephen Rothwell
2022-02-08 6:13 ` Kees Cook
2022-01-25 2:55 Stephen Rothwell
2022-01-25 3:02 ` Stephen Rothwell
2022-01-25 3:22 ` Kees Cook
2022-01-25 0:57 Stephen Rothwell
2022-01-25 3:35 ` Kees Cook
2022-01-25 14:07 ` David Sterba
2021-09-16 3:34 Stephen Rothwell
2021-09-16 6:00 ` Kees Cook
2021-08-26 7:52 Stephen Rothwell
2021-08-26 15:38 ` Kees Cook
2020-06-23 3:51 Stephen Rothwell
2020-06-23 3:56 ` David Miller
2020-06-21 13:48 Stephen Rothwell
2020-06-21 15:36 ` Kees Cook
2018-07-27 9:02 Stephen Rothwell
2018-07-27 9:06 ` Stephen Rothwell
2018-07-27 10:55 ` Stephen Rothwell
2018-07-27 12:55 ` Will Deacon
2018-07-27 13:01 ` Will Deacon
2018-07-27 13:27 ` Will Deacon
2018-07-27 16:00 ` Kees Cook
2018-07-30 7:33 ` Stephen Rothwell
2018-07-30 14:47 ` Laura Abbott
2018-07-30 16:37 ` Will Deacon
2018-07-31 10:09 ` Will Deacon
2018-07-31 11:27 ` Stephen Rothwell
2017-11-08 5:23 Stephen Rothwell
2017-11-08 23:43 ` Kees Cook
2017-11-09 0:18 ` Darrick J. Wong
2017-11-09 0:31 ` Kees Cook
2017-06-20 4:56 Stephen Rothwell
2017-06-20 5:39 ` Kees Cook
2017-06-20 5:42 ` John Johansen
2017-06-20 5:39 ` John Johansen
2017-06-26 18:19 ` Kees Cook
2017-06-27 3:33 ` James Morris
2017-06-27 22:16 ` Kees Cook
2017-06-28 5:48 ` James Morris
2017-06-16 1:30 Stephen Rothwell
2017-06-16 2:51 ` Daniel Micay
2017-06-16 2:52 ` Daniel Micay
2017-06-16 3:20 ` Kees Cook
2017-06-16 3:31 ` Stephen Rothwell
2017-06-19 0:23 ` Stephen Rothwell
2017-06-19 21:01 ` Kees Cook
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=202203090918.A993715E6@keescook \
--to=keescook@chromium.org \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=markgross@kernel.org \
--cc=markpearson@lenovo.com \
--cc=sfr@canb.auug.org.au \
/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).