From: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
To: Yassine Oudjana <yassine.oudjana@gmail.com>
Cc: Mark Brown <broonie@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
linux-kernel@vger.kernel.org,
Yassine Oudjana <y.oudjana@protonmail.com>
Subject: Re: [PATCH] regmap-irq: Use the new num_config_regs property in regmap_add_irq_chip_fwnode
Date: Mon, 07 Nov 2022 23:58:01 +0000 [thread overview]
Message-ID: <YRVTxVzmyHg9azsCXIwib22zfh2O3Xr6@localhost> (raw)
In-Reply-To: <20221107202114.823975-1-y.oudjana@protonmail.com>
Hi Yassine,
> Commit faa87ce9196d ("regmap-irq: Introduce config registers for irq
> types") added the num_config_regs, then commit 9edd4f5aee84 ("regmap-irq:
> Deprecate type registers and virtual registers") suggested to replace
> num_type_reg with it. However, regmap_add_irq_chip_fwnode wasn't modified
> to use the new property. Later on, commit 255a03bb1bb3 ("ASoC: wcd9335:
> Convert irq chip to config regs") removed the old num_type_reg property
> from the WCD9335 driver's struct regmap_irq_chip, causing a null pointer
> dereference in regmap_irq_set_type when it tried to index d->type_buf as
> it was never allocated in regmap_add_irq_chip_fwnode:
Whoops... My bad. Actually, d->type_buf shouldn't be accessed in this
configuration, the bug is in regmap_irq_set_type(). The access should
be guarded by "if (d->chip->type_in_mask || d->chip->num_type_reg)" to
prevent the NULL deref.
>
> Use num_config_regs in regmap_add_irq_chip_fwnode instead of num_type_reg,
> and fall back to it if num_config_regs isn't defined to maintain backward
> compatibility.
>
> Fixes: faa87ce9196d ("regmap-irq: Introduce config registers for irq types")
> Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
> ---
> drivers/base/regmap/regmap-irq.c | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
> index 4ef9488d05cd..3de89795f584 100644
> --- a/drivers/base/regmap/regmap-irq.c
> +++ b/drivers/base/regmap/regmap-irq.c
> @@ -722,6 +722,7 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
> int i;
> int ret = -ENOMEM;
> int num_type_reg;
> + int num_regs;
> u32 reg;
>
> if (chip->num_regs <= 0)
> @@ -796,14 +797,20 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
> goto err_alloc;
> }
>
> - num_type_reg = chip->type_in_mask ? chip->num_regs : chip->num_type_reg;
> - if (num_type_reg) {
> - d->type_buf_def = kcalloc(num_type_reg,
> + /*
> + * Use num_config_regs if defined, otherwise fall back to num_type_reg
> + * to maintain backward compatibility.
> + */
> + num_type_reg = chip->num_config_regs ? chip->num_config_regs
> + : chip->num_type_reg;
A chip that uses config regs doesn't need type_buf. If you check
regmap_irq_sync_unlock(), you'll see the contents of type_buf aren't
written to the registers unless num_type_reg > 0.
If type_in_mask is set, type_buf has a completely different meaning.
There are no type registers -- instead each trigger has its own IRQ
enable bit. The type_buf records which bit (= trigger type) is used
for the logical IRQ.
Regards,
Aidan
> + num_regs = chip->type_in_mask ? chip->num_regs : num_type_reg;
> + if (num_regs) {
> + d->type_buf_def = kcalloc(num_regs,
> sizeof(*d->type_buf_def), GFP_KERNEL);
> if (!d->type_buf_def)
> goto err_alloc;
>
> - d->type_buf = kcalloc(num_type_reg, sizeof(*d->type_buf),
> + d->type_buf = kcalloc(num_regs, sizeof(*d->type_buf),
> GFP_KERNEL);
> if (!d->type_buf)
> goto err_alloc;
next prev parent reply other threads:[~2022-11-07 23:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-07 20:21 [PATCH] regmap-irq: Use the new num_config_regs property in regmap_add_irq_chip_fwnode Yassine Oudjana
2022-11-07 23:58 ` Aidan MacDonald [this message]
2022-11-09 18:31 ` Mark Brown
2022-11-10 21:13 ` Mark Brown
2022-11-12 13:52 ` Aidan MacDonald
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=YRVTxVzmyHg9azsCXIwib22zfh2O3Xr6@localhost \
--to=aidanmacdonald.0x0@gmail.com \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=y.oudjana@protonmail.com \
--cc=yassine.oudjana@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;
as well as URLs for NNTP newsgroup(s).