* [PATCH] ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm
@ 2013-11-27 11:57 Rajendra Nayak
2013-11-28 1:55 ` Nishanth Menon
0 siblings, 1 reply; 3+ messages in thread
From: Rajendra Nayak @ 2013-11-27 11:57 UTC (permalink / raw)
To: linux-omap; +Cc: tony, nm, dan.carpenter, Rajendra Nayak
Commit 'cd8abed' "ARM: OMAP2+: Powerdomain: Remove the need to
always have a voltdm associated to a pwrdm" leads to the following
Smatch complaint:
arch/arm/mach-omap2/powerdomain.c:131 _pwrdm_register()
error: we previously assumed 'arch_pwrdm' could be null (see line 105)
So, fix the unchecked dereference of arch_pwrdm.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
---
arch/arm/mach-omap2/powerdomain.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index e233dfc..93a2a6e 100644
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c
@@ -128,7 +128,8 @@ skip_voltdm:
for (i = 0; i < pwrdm->banks; i++)
pwrdm->ret_mem_off_counter[i] = 0;
- arch_pwrdm->pwrdm_wait_transition(pwrdm);
+ if (arch_pwrdm && arch_pwrdm->pwrdm_wait_transition)
+ arch_pwrdm->pwrdm_wait_transition(pwrdm);
pwrdm->state = pwrdm_read_pwrst(pwrdm);
pwrdm->state_counter[pwrdm->state] = 1;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm
2013-11-27 11:57 [PATCH] ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm Rajendra Nayak
@ 2013-11-28 1:55 ` Nishanth Menon
2013-12-02 19:20 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Nishanth Menon @ 2013-11-28 1:55 UTC (permalink / raw)
To: Rajendra Nayak, linux-omap; +Cc: tony, dan.carpenter
On 11/27/2013 05:57 AM, Rajendra Nayak wrote:
> Commit 'cd8abed' "ARM: OMAP2+: Powerdomain: Remove the need to
> always have a voltdm associated to a pwrdm" leads to the following
> Smatch complaint:
>
> arch/arm/mach-omap2/powerdomain.c:131 _pwrdm_register()
> error: we previously assumed 'arch_pwrdm' could be null (see line 105)
>
> So, fix the unchecked dereference of arch_pwrdm.
>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> ---
> arch/arm/mach-omap2/powerdomain.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
> index e233dfc..93a2a6e 100644
> --- a/arch/arm/mach-omap2/powerdomain.c
> +++ b/arch/arm/mach-omap2/powerdomain.c
> @@ -128,7 +128,8 @@ skip_voltdm:
> for (i = 0; i < pwrdm->banks; i++)
> pwrdm->ret_mem_off_counter[i] = 0;
>
> - arch_pwrdm->pwrdm_wait_transition(pwrdm);
> + if (arch_pwrdm && arch_pwrdm->pwrdm_wait_transition)
> + arch_pwrdm->pwrdm_wait_transition(pwrdm);
> pwrdm->state = pwrdm_read_pwrst(pwrdm);
> pwrdm->state_counter[pwrdm->state] = 1;
>
>
Acked-by: Nishanth Menon <nm@ti.com>
--
Regards,
Nishanth Menon
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm
2013-11-28 1:55 ` Nishanth Menon
@ 2013-12-02 19:20 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2013-12-02 19:20 UTC (permalink / raw)
To: Nishanth Menon; +Cc: Rajendra Nayak, linux-omap, dan.carpenter
* Nishanth Menon <nm@ti.com> [131127 17:56]:
> On 11/27/2013 05:57 AM, Rajendra Nayak wrote:
> > Commit 'cd8abed' "ARM: OMAP2+: Powerdomain: Remove the need to
> > always have a voltdm associated to a pwrdm" leads to the following
> > Smatch complaint:
> >
> > arch/arm/mach-omap2/powerdomain.c:131 _pwrdm_register()
> > error: we previously assumed 'arch_pwrdm' could be null (see line 105)
> >
> > So, fix the unchecked dereference of arch_pwrdm.
> >
> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> > Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> > ---
> > arch/arm/mach-omap2/powerdomain.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
> > index e233dfc..93a2a6e 100644
> > --- a/arch/arm/mach-omap2/powerdomain.c
> > +++ b/arch/arm/mach-omap2/powerdomain.c
> > @@ -128,7 +128,8 @@ skip_voltdm:
> > for (i = 0; i < pwrdm->banks; i++)
> > pwrdm->ret_mem_off_counter[i] = 0;
> >
> > - arch_pwrdm->pwrdm_wait_transition(pwrdm);
> > + if (arch_pwrdm && arch_pwrdm->pwrdm_wait_transition)
> > + arch_pwrdm->pwrdm_wait_transition(pwrdm);
> > pwrdm->state = pwrdm_read_pwrst(pwrdm);
> > pwrdm->state_counter[pwrdm->state] = 1;
> >
> >
> Acked-by: Nishanth Menon <nm@ti.com>
I'll queue this into omap-for-v3.13/fixes-take4.
Regards,
Tony
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-02 19:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-27 11:57 [PATCH] ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm Rajendra Nayak
2013-11-28 1:55 ` Nishanth Menon
2013-12-02 19:20 ` Tony Lindgren
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).