* [PATCH] cpufreq: qcom-cpufreq-hw: Avoid stack buffer for IRQ name
@ 2021-09-01 8:47 ` Ard Biesheuvel
0 siblings, 0 replies; 10+ messages in thread
From: Ard Biesheuvel @ 2021-09-01 8:47 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Ard Biesheuvel, Thara Gopinath, Bjorn Andersson, Andy Gross,
linux-arm-msm
Registering an IRQ requires the string buffer containing the name to
remain allocated, as the name is not copied into another buffer.
So let's add a irq_name field to the data struct instead, which is
guaranteed to have the appropriate lifetime.
Cc: Thara Gopinath <thara.gopinath@linaro.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Andy Gross <agross@kernel.org>
Cc: linux-arm-msm@vger.kernel.org
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
I'm not following msm development closely, so apologies if this was
already fixed, or if this is not based on the right tree.
This fixes a crash on my Yoga C630 when reading /proc/interrupts.
drivers/cpufreq/qcom-cpufreq-hw.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c
index 3cc27d9e2ed1..6613228fe68c 100644
--- a/drivers/cpufreq/qcom-cpufreq-hw.c
+++ b/drivers/cpufreq/qcom-cpufreq-hw.c
@@ -44,6 +44,7 @@ struct qcom_cpufreq_data {
/* Lock to synchronize between de-init sequence and re-starting LMh polling/interrupts */
spinlock_t throttle_lock;
int throttle_irq;
+ char irq_name[15];
bool cancel_throttle;
};
@@ -371,7 +372,6 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index)
{
struct qcom_cpufreq_data *data = policy->driver_data;
struct platform_device *pdev = cpufreq_get_driver_data();
- char irq_name[15];
int ret;
/*
@@ -388,11 +388,11 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index)
spin_lock_init(&data->throttle_lock);
INIT_DEFERRABLE_WORK(&data->throttle_work, qcom_lmh_dcvs_poll);
- snprintf(irq_name, sizeof(irq_name), "dcvsh-irq-%u", policy->cpu);
+ snprintf(data->irq_name, sizeof(data->irq_name), "dcvsh-irq-%u", policy->cpu);
ret = request_threaded_irq(data->throttle_irq, NULL, qcom_lmh_dcvs_handle_irq,
- IRQF_ONESHOT, irq_name, data);
+ IRQF_ONESHOT, data->irq_name, data);
if (ret) {
- dev_err(&pdev->dev, "Error registering %s: %d\n", irq_name, ret);
+ dev_err(&pdev->dev, "Error registering %s: %d\n", data->irq_name, ret);
return 0;
}
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH] cpufreq: qcom-cpufreq-hw: Avoid stack buffer for IRQ name
2021-09-01 8:47 ` Ard Biesheuvel
@ 2021-09-01 10:59 ` Steev Klimaszewski
-1 siblings, 0 replies; 10+ messages in thread
From: Steev Klimaszewski @ 2021-09-01 10:59 UTC (permalink / raw)
To: Ard Biesheuvel, linux-arm-kernel
Cc: Thara Gopinath, Bjorn Andersson, Andy Gross, linux-arm-msm
On 9/1/21 3:47 AM, Ard Biesheuvel wrote:
> Registering an IRQ requires the string buffer containing the name to
> remain allocated, as the name is not copied into another buffer.
>
> So let's add a irq_name field to the data struct instead, which is
> guaranteed to have the appropriate lifetime.
>
> Cc: Thara Gopinath <thara.gopinath@linaro.org>
> Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
> Cc: Andy Gross <agross@kernel.org>
> Cc: linux-arm-msm@vger.kernel.org
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
> I'm not following msm development closely, so apologies if this was
> already fixed, or if this is not based on the right tree.
>
> This fixes a crash on my Yoga C630 when reading /proc/interrupts.
>
> drivers/cpufreq/qcom-cpufreq-hw.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c
> index 3cc27d9e2ed1..6613228fe68c 100644
> --- a/drivers/cpufreq/qcom-cpufreq-hw.c
> +++ b/drivers/cpufreq/qcom-cpufreq-hw.c
> @@ -44,6 +44,7 @@ struct qcom_cpufreq_data {
> /* Lock to synchronize between de-init sequence and re-starting LMh polling/interrupts */
> spinlock_t throttle_lock;
> int throttle_irq;
> + char irq_name[15];
> bool cancel_throttle;
> };
>
> @@ -371,7 +372,6 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index)
> {
> struct qcom_cpufreq_data *data = policy->driver_data;
> struct platform_device *pdev = cpufreq_get_driver_data();
> - char irq_name[15];
> int ret;
>
> /*
> @@ -388,11 +388,11 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index)
> spin_lock_init(&data->throttle_lock);
> INIT_DEFERRABLE_WORK(&data->throttle_work, qcom_lmh_dcvs_poll);
>
> - snprintf(irq_name, sizeof(irq_name), "dcvsh-irq-%u", policy->cpu);
> + snprintf(data->irq_name, sizeof(data->irq_name), "dcvsh-irq-%u", policy->cpu);
> ret = request_threaded_irq(data->throttle_irq, NULL, qcom_lmh_dcvs_handle_irq,
> - IRQF_ONESHOT, irq_name, data);
> + IRQF_ONESHOT, data->irq_name, data);
> if (ret) {
> - dev_err(&pdev->dev, "Error registering %s: %d\n", irq_name, ret);
> + dev_err(&pdev->dev, "Error registering %s: %d\n", data->irq_name, ret);
> return 0;
> }
>
I haven't experienced the crash here, but I also tested the patch on my
C630, and still don't see the issue so, if you want:
Tested-By: Steev Klimaszewski <steev@kali.org>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] cpufreq: qcom-cpufreq-hw: Avoid stack buffer for IRQ name
@ 2021-09-01 10:59 ` Steev Klimaszewski
0 siblings, 0 replies; 10+ messages in thread
From: Steev Klimaszewski @ 2021-09-01 10:59 UTC (permalink / raw)
To: Ard Biesheuvel, linux-arm-kernel
Cc: Thara Gopinath, Bjorn Andersson, Andy Gross, linux-arm-msm
On 9/1/21 3:47 AM, Ard Biesheuvel wrote:
> Registering an IRQ requires the string buffer containing the name to
> remain allocated, as the name is not copied into another buffer.
>
> So let's add a irq_name field to the data struct instead, which is
> guaranteed to have the appropriate lifetime.
>
> Cc: Thara Gopinath <thara.gopinath@linaro.org>
> Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
> Cc: Andy Gross <agross@kernel.org>
> Cc: linux-arm-msm@vger.kernel.org
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
> I'm not following msm development closely, so apologies if this was
> already fixed, or if this is not based on the right tree.
>
> This fixes a crash on my Yoga C630 when reading /proc/interrupts.
>
> drivers/cpufreq/qcom-cpufreq-hw.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c
> index 3cc27d9e2ed1..6613228fe68c 100644
> --- a/drivers/cpufreq/qcom-cpufreq-hw.c
> +++ b/drivers/cpufreq/qcom-cpufreq-hw.c
> @@ -44,6 +44,7 @@ struct qcom_cpufreq_data {
> /* Lock to synchronize between de-init sequence and re-starting LMh polling/interrupts */
> spinlock_t throttle_lock;
> int throttle_irq;
> + char irq_name[15];
> bool cancel_throttle;
> };
>
> @@ -371,7 +372,6 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index)
> {
> struct qcom_cpufreq_data *data = policy->driver_data;
> struct platform_device *pdev = cpufreq_get_driver_data();
> - char irq_name[15];
> int ret;
>
> /*
> @@ -388,11 +388,11 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index)
> spin_lock_init(&data->throttle_lock);
> INIT_DEFERRABLE_WORK(&data->throttle_work, qcom_lmh_dcvs_poll);
>
> - snprintf(irq_name, sizeof(irq_name), "dcvsh-irq-%u", policy->cpu);
> + snprintf(data->irq_name, sizeof(data->irq_name), "dcvsh-irq-%u", policy->cpu);
> ret = request_threaded_irq(data->throttle_irq, NULL, qcom_lmh_dcvs_handle_irq,
> - IRQF_ONESHOT, irq_name, data);
> + IRQF_ONESHOT, data->irq_name, data);
> if (ret) {
> - dev_err(&pdev->dev, "Error registering %s: %d\n", irq_name, ret);
> + dev_err(&pdev->dev, "Error registering %s: %d\n", data->irq_name, ret);
> return 0;
> }
>
I haven't experienced the crash here, but I also tested the patch on my
C630, and still don't see the issue so, if you want:
Tested-By: Steev Klimaszewski <steev@kali.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] cpufreq: qcom-cpufreq-hw: Avoid stack buffer for IRQ name
2021-09-01 8:47 ` Ard Biesheuvel
@ 2021-09-01 19:22 ` Thara Gopinath
-1 siblings, 0 replies; 10+ messages in thread
From: Thara Gopinath @ 2021-09-01 19:22 UTC (permalink / raw)
To: Ard Biesheuvel, linux-arm-kernel
Cc: Bjorn Andersson, Andy Gross, linux-arm-msm
On 9/1/21 4:47 AM, Ard Biesheuvel wrote:
> Registering an IRQ requires the string buffer containing the name to
> remain allocated, as the name is not copied into another buffer.
>
> So let's add a irq_name field to the data struct instead, which is
> guaranteed to have the appropriate lifetime.
>
> Cc: Thara Gopinath <thara.gopinath@linaro.org>
> Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
> Cc: Andy Gross <agross@kernel.org>
> Cc: linux-arm-msm@vger.kernel.org
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Thanks for the fix.
Reviewed-by: Thara Gopinath <thara.gopinath@linaro.org>
--
Warm Regards
Thara (She/Her/Hers)
> ---
> I'm not following msm development closely, so apologies if this was
> already fixed, or if this is not based on the right tree.
>
> This fixes a crash on my Yoga C630 when reading /proc/interrupts.
>
> drivers/cpufreq/qcom-cpufreq-hw.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c
> index 3cc27d9e2ed1..6613228fe68c 100644
> --- a/drivers/cpufreq/qcom-cpufreq-hw.c
> +++ b/drivers/cpufreq/qcom-cpufreq-hw.c
> @@ -44,6 +44,7 @@ struct qcom_cpufreq_data {
> /* Lock to synchronize between de-init sequence and re-starting LMh polling/interrupts */
> spinlock_t throttle_lock;
> int throttle_irq;
> + char irq_name[15];
> bool cancel_throttle;
> };
>
> @@ -371,7 +372,6 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index)
> {
> struct qcom_cpufreq_data *data = policy->driver_data;
> struct platform_device *pdev = cpufreq_get_driver_data();
> - char irq_name[15];
> int ret;
>
> /*
> @@ -388,11 +388,11 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index)
> spin_lock_init(&data->throttle_lock);
> INIT_DEFERRABLE_WORK(&data->throttle_work, qcom_lmh_dcvs_poll);
>
> - snprintf(irq_name, sizeof(irq_name), "dcvsh-irq-%u", policy->cpu);
> + snprintf(data->irq_name, sizeof(data->irq_name), "dcvsh-irq-%u", policy->cpu);
> ret = request_threaded_irq(data->throttle_irq, NULL, qcom_lmh_dcvs_handle_irq,
> - IRQF_ONESHOT, irq_name, data);
> + IRQF_ONESHOT, data->irq_name, data);
> if (ret) {
> - dev_err(&pdev->dev, "Error registering %s: %d\n", irq_name, ret);
> + dev_err(&pdev->dev, "Error registering %s: %d\n", data->irq_name, ret);
> return 0;
> }
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] cpufreq: qcom-cpufreq-hw: Avoid stack buffer for IRQ name
@ 2021-09-01 19:22 ` Thara Gopinath
0 siblings, 0 replies; 10+ messages in thread
From: Thara Gopinath @ 2021-09-01 19:22 UTC (permalink / raw)
To: Ard Biesheuvel, linux-arm-kernel
Cc: Bjorn Andersson, Andy Gross, linux-arm-msm
On 9/1/21 4:47 AM, Ard Biesheuvel wrote:
> Registering an IRQ requires the string buffer containing the name to
> remain allocated, as the name is not copied into another buffer.
>
> So let's add a irq_name field to the data struct instead, which is
> guaranteed to have the appropriate lifetime.
>
> Cc: Thara Gopinath <thara.gopinath@linaro.org>
> Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
> Cc: Andy Gross <agross@kernel.org>
> Cc: linux-arm-msm@vger.kernel.org
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Thanks for the fix.
Reviewed-by: Thara Gopinath <thara.gopinath@linaro.org>
--
Warm Regards
Thara (She/Her/Hers)
> ---
> I'm not following msm development closely, so apologies if this was
> already fixed, or if this is not based on the right tree.
>
> This fixes a crash on my Yoga C630 when reading /proc/interrupts.
>
> drivers/cpufreq/qcom-cpufreq-hw.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c
> index 3cc27d9e2ed1..6613228fe68c 100644
> --- a/drivers/cpufreq/qcom-cpufreq-hw.c
> +++ b/drivers/cpufreq/qcom-cpufreq-hw.c
> @@ -44,6 +44,7 @@ struct qcom_cpufreq_data {
> /* Lock to synchronize between de-init sequence and re-starting LMh polling/interrupts */
> spinlock_t throttle_lock;
> int throttle_irq;
> + char irq_name[15];
> bool cancel_throttle;
> };
>
> @@ -371,7 +372,6 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index)
> {
> struct qcom_cpufreq_data *data = policy->driver_data;
> struct platform_device *pdev = cpufreq_get_driver_data();
> - char irq_name[15];
> int ret;
>
> /*
> @@ -388,11 +388,11 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index)
> spin_lock_init(&data->throttle_lock);
> INIT_DEFERRABLE_WORK(&data->throttle_work, qcom_lmh_dcvs_poll);
>
> - snprintf(irq_name, sizeof(irq_name), "dcvsh-irq-%u", policy->cpu);
> + snprintf(data->irq_name, sizeof(data->irq_name), "dcvsh-irq-%u", policy->cpu);
> ret = request_threaded_irq(data->throttle_irq, NULL, qcom_lmh_dcvs_handle_irq,
> - IRQF_ONESHOT, irq_name, data);
> + IRQF_ONESHOT, data->irq_name, data);
> if (ret) {
> - dev_err(&pdev->dev, "Error registering %s: %d\n", irq_name, ret);
> + dev_err(&pdev->dev, "Error registering %s: %d\n", data->irq_name, ret);
> return 0;
> }
>
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] cpufreq: qcom-cpufreq-hw: Avoid stack buffer for IRQ name
2021-09-01 19:22 ` Thara Gopinath
@ 2021-12-20 10:12 ` Loic Poulain
-1 siblings, 0 replies; 10+ messages in thread
From: Loic Poulain @ 2021-12-20 10:12 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Ard Biesheuvel
Cc: linux-arm-kernel, Thara Gopinath, linux-arm-msm
> On 9/1/21 4:47 AM, Ard Biesheuvel wrote:
> > Registering an IRQ requires the string buffer containing the name to
> > remain allocated, as the name is not copied into another buffer.
> >
> > So let's add a irq_name field to the data struct instead, which is
> > guaranteed to have the appropriate lifetime.
> >
> > Cc: Thara Gopinath <thara.gopinath@linaro.org>
> > Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
> > Cc: Andy Gross <agross@kernel.org>
> > Cc: linux-arm-msm@vger.kernel.org
> > Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
>
> Thanks for the fix.
>
> Reviewed-by: Thara Gopinath <thara.gopinath@linaro.org>
Seems this patch has been overlooked. Would it be possible to resubmit
it with a 'Fixes' tag?
Regards,
Loic
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] cpufreq: qcom-cpufreq-hw: Avoid stack buffer for IRQ name
@ 2021-12-20 10:12 ` Loic Poulain
0 siblings, 0 replies; 10+ messages in thread
From: Loic Poulain @ 2021-12-20 10:12 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Ard Biesheuvel
Cc: linux-arm-kernel, Thara Gopinath, linux-arm-msm
> On 9/1/21 4:47 AM, Ard Biesheuvel wrote:
> > Registering an IRQ requires the string buffer containing the name to
> > remain allocated, as the name is not copied into another buffer.
> >
> > So let's add a irq_name field to the data struct instead, which is
> > guaranteed to have the appropriate lifetime.
> >
> > Cc: Thara Gopinath <thara.gopinath@linaro.org>
> > Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
> > Cc: Andy Gross <agross@kernel.org>
> > Cc: linux-arm-msm@vger.kernel.org
> > Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
>
> Thanks for the fix.
>
> Reviewed-by: Thara Gopinath <thara.gopinath@linaro.org>
Seems this patch has been overlooked. Would it be possible to resubmit
it with a 'Fixes' tag?
Regards,
Loic
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] cpufreq: qcom-cpufreq-hw: Avoid stack buffer for IRQ name
2021-12-20 10:12 ` Loic Poulain
@ 2021-12-20 23:43 ` Bjorn Andersson
-1 siblings, 0 replies; 10+ messages in thread
From: Bjorn Andersson @ 2021-12-20 23:43 UTC (permalink / raw)
To: Loic Poulain
Cc: Andy Gross, Ard Biesheuvel, linux-arm-kernel, Thara Gopinath,
linux-arm-msm
On Mon 20 Dec 02:12 PST 2021, Loic Poulain wrote:
> > On 9/1/21 4:47 AM, Ard Biesheuvel wrote:
> > > Registering an IRQ requires the string buffer containing the name to
> > > remain allocated, as the name is not copied into another buffer.
> > >
> > > So let's add a irq_name field to the data struct instead, which is
> > > guaranteed to have the appropriate lifetime.
> > >
> > > Cc: Thara Gopinath <thara.gopinath@linaro.org>
> > > Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
> > > Cc: Andy Gross <agross@kernel.org>
> > > Cc: linux-arm-msm@vger.kernel.org
> > > Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> >
> > Thanks for the fix.
> >
> > Reviewed-by: Thara Gopinath <thara.gopinath@linaro.org>
>
> Seems this patch has been overlooked. Would it be possible to resubmit
> it with a 'Fixes' tag?
>
This was resubmitted by Vladimir and Viresh replied that it's applied,
see:
https://lore.kernel.org/all/20211125065014.phkfugo2wptosrgv@vireshk-i7/
Regards,
Bjorn
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] cpufreq: qcom-cpufreq-hw: Avoid stack buffer for IRQ name
@ 2021-12-20 23:43 ` Bjorn Andersson
0 siblings, 0 replies; 10+ messages in thread
From: Bjorn Andersson @ 2021-12-20 23:43 UTC (permalink / raw)
To: Loic Poulain
Cc: Andy Gross, Ard Biesheuvel, linux-arm-kernel, Thara Gopinath,
linux-arm-msm
On Mon 20 Dec 02:12 PST 2021, Loic Poulain wrote:
> > On 9/1/21 4:47 AM, Ard Biesheuvel wrote:
> > > Registering an IRQ requires the string buffer containing the name to
> > > remain allocated, as the name is not copied into another buffer.
> > >
> > > So let's add a irq_name field to the data struct instead, which is
> > > guaranteed to have the appropriate lifetime.
> > >
> > > Cc: Thara Gopinath <thara.gopinath@linaro.org>
> > > Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
> > > Cc: Andy Gross <agross@kernel.org>
> > > Cc: linux-arm-msm@vger.kernel.org
> > > Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> >
> > Thanks for the fix.
> >
> > Reviewed-by: Thara Gopinath <thara.gopinath@linaro.org>
>
> Seems this patch has been overlooked. Would it be possible to resubmit
> it with a 'Fixes' tag?
>
This was resubmitted by Vladimir and Viresh replied that it's applied,
see:
https://lore.kernel.org/all/20211125065014.phkfugo2wptosrgv@vireshk-i7/
Regards,
Bjorn
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread