From: Amelie DELAUNAY <amelie.delaunay@st.com>
To: Dan Carpenter <dan.carpenter@oracle.com>,
Lee Jones <lee.jones@linaro.org>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre TORGUE <alexandre.torgue@st.com>,
"linux-stm32@st-md-mailman.stormreply.com"
<linux-stm32@st-md-mailman.stormreply.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"kernel-janitors@vger.kernel.org"
<kernel-janitors@vger.kernel.org>
Subject: Re: [PATCH v2] mfd: stmfx: Uninitialized variable in stmfx_irq_handler()
Date: Thu, 6 Jun 2019 12:56:38 +0000 [thread overview]
Message-ID: <b1374627-7af2-77cd-c7f2-40166fce5a04@st.com> (raw)
In-Reply-To: <20190606124127.GA17082@mwanda>
On 6/6/19 2:41 PM, Dan Carpenter wrote:
> The problem is that on 64bit systems then we don't clear the higher
> bits of the "pending" variable. So when we do:
>
> ack = pending & ~BIT(STMFX_REG_IRQ_SRC_EN_GPIO);
> if (ack) {
>
> the if (ack) condition relies on uninitialized data. The fix it that
> I've changed "pending" from an unsigned long to a u32. I changed "n" as
> well, because that's a number in the 0-10 range and it fits easily
> inside an int. We do need to add a cast to "pending" when we use it in
> the for_each_set_bit() loop, but that doesn't cause a proble, it's
> fine.
>
> Fixes: 06252ade9156 ("mfd: Add ST Multi-Function eXpander (STMFX) core driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Amelie Delaunay <amelie.delaunay@st.com>
> ---
> v2: white space changes
>
> drivers/mfd/stmfx.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c
> index fe8efba2d45f..7c419c078688 100644
> --- a/drivers/mfd/stmfx.c
> +++ b/drivers/mfd/stmfx.c
> @@ -204,12 +204,10 @@ static struct irq_chip stmfx_irq_chip = {
> static irqreturn_t stmfx_irq_handler(int irq, void *data)
> {
> struct stmfx *stmfx = data;
> - unsigned long n, pending;
> - u32 ack;
> - int ret;
> + u32 pending, ack;
> + int n, ret;
>
> - ret = regmap_read(stmfx->map, STMFX_REG_IRQ_PENDING,
> - (u32 *)&pending);
> + ret = regmap_read(stmfx->map, STMFX_REG_IRQ_PENDING, &pending);
> if (ret)
> return IRQ_NONE;
>
> @@ -224,7 +222,7 @@ static irqreturn_t stmfx_irq_handler(int irq, void *data)
> return IRQ_NONE;
> }
>
> - for_each_set_bit(n, &pending, STMFX_REG_IRQ_SRC_MAX)
> + for_each_set_bit(n, (unsigned long *)&pending, STMFX_REG_IRQ_SRC_MAX)
> handle_nested_irq(irq_find_mapping(stmfx->irq_domain, n));
>
> return IRQ_HANDLED;
>
next prev parent reply other threads:[~2019-06-06 12:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-15 9:31 [PATCH] " Dan Carpenter
2019-06-03 8:12 ` Lee Jones
2019-06-03 9:20 ` Amelie DELAUNAY
2019-06-06 12:41 ` [PATCH v2] " Dan Carpenter
2019-06-06 12:56 ` Amelie DELAUNAY [this message]
2019-06-12 9:37 ` Lee Jones
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=b1374627-7af2-77cd-c7f2-40166fce5a04@st.com \
--to=amelie.delaunay@st.com \
--cc=alexandre.torgue@st.com \
--cc=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
/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
all inboxes | Powered by JetHome®