* [PATCH] intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it.
@ 2012-08-02 14:39 Konrad Rzeszutek Wilk
2012-08-04 21:56 ` Rafael J. Wysocki
0 siblings, 1 reply; 5+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-08-02 14:39 UTC (permalink / raw)
To: lenb, linux-pm, linux-kernel; +Cc: Konrad Rzeszutek Wilk
If the machine is booted without any cpu_idle driver set
(b/c disable_cpuidle() has been called) we should follow
other users of cpu_idle API and check the return value
for NULL before using it.
Reported-by: Mark van Dijk <mark@internecto.net>
Tested-by: Mark van Dijk <mark@internecto.net>
Suggested-by: Jan Beulich <JBeulich@suse.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
drivers/idle/intel_idle.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index f559088..7383aa0 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -607,7 +607,7 @@ static int __init intel_idle_init(void)
retval = cpuidle_register_driver(&intel_idle_driver);
if (retval) {
printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
- cpuidle_get_driver()->name);
+ cpuidle_get_driver() ? cpuidle_get_driver()->name : "none");
return retval;
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it.
2012-08-02 14:39 [PATCH] intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it Konrad Rzeszutek Wilk
@ 2012-08-04 21:56 ` Rafael J. Wysocki
2012-08-06 14:33 ` Konrad Rzeszutek Wilk
2012-08-06 14:50 ` Konrad Rzeszutek Wilk
0 siblings, 2 replies; 5+ messages in thread
From: Rafael J. Wysocki @ 2012-08-04 21:56 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk; +Cc: lenb, linux-pm, linux-kernel
On Thursday, August 02, 2012, Konrad Rzeszutek Wilk wrote:
> If the machine is booted without any cpu_idle driver set
> (b/c disable_cpuidle() has been called) we should follow
> other users of cpu_idle API and check the return value
> for NULL before using it.
>
> Reported-by: Mark van Dijk <mark@internecto.net>
> Tested-by: Mark van Dijk <mark@internecto.net>
> Suggested-by: Jan Beulich <JBeulich@suse.com>
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> ---
> drivers/idle/intel_idle.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
> index f559088..7383aa0 100644
> --- a/drivers/idle/intel_idle.c
> +++ b/drivers/idle/intel_idle.c
> @@ -607,7 +607,7 @@ static int __init intel_idle_init(void)
> retval = cpuidle_register_driver(&intel_idle_driver);
> if (retval) {
What about:
struct cpuidle_driver *drv = cpuidle_get_driver();
printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
drv ? drv->name : "none");
> printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
> - cpuidle_get_driver()->name);
> + cpuidle_get_driver() ? cpuidle_get_driver()->name : "none");
> return retval;
> }
>
>
Rafael
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it.
2012-08-04 21:56 ` Rafael J. Wysocki
@ 2012-08-06 14:33 ` Konrad Rzeszutek Wilk
2012-08-06 14:50 ` Konrad Rzeszutek Wilk
1 sibling, 0 replies; 5+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-08-06 14:33 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: lenb, linux-pm, linux-kernel
On Sat, Aug 04, 2012 at 11:56:35PM +0200, Rafael J. Wysocki wrote:
> On Thursday, August 02, 2012, Konrad Rzeszutek Wilk wrote:
> > If the machine is booted without any cpu_idle driver set
> > (b/c disable_cpuidle() has been called) we should follow
> > other users of cpu_idle API and check the return value
> > for NULL before using it.
> >
> > Reported-by: Mark van Dijk <mark@internecto.net>
> > Tested-by: Mark van Dijk <mark@internecto.net>
> > Suggested-by: Jan Beulich <JBeulich@suse.com>
> > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > ---
> > drivers/idle/intel_idle.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
> > index f559088..7383aa0 100644
> > --- a/drivers/idle/intel_idle.c
> > +++ b/drivers/idle/intel_idle.c
> > @@ -607,7 +607,7 @@ static int __init intel_idle_init(void)
> > retval = cpuidle_register_driver(&intel_idle_driver);
> > if (retval) {
>
> What about:
>
> struct cpuidle_driver *drv = cpuidle_get_driver();
>
> printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
> drv ? drv->name : "none");
Much prettier. Let me spin that up.
>
> > printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
> > - cpuidle_get_driver()->name);
> > + cpuidle_get_driver() ? cpuidle_get_driver()->name : "none");
> > return retval;
> > }
> >
> >
>
> Rafael
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it.
2012-08-04 21:56 ` Rafael J. Wysocki
2012-08-06 14:33 ` Konrad Rzeszutek Wilk
@ 2012-08-06 14:50 ` Konrad Rzeszutek Wilk
2012-08-16 20:19 ` Rafael J. Wysocki
1 sibling, 1 reply; 5+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-08-06 14:50 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: lenb, linux-pm, linux-kernel
On Sat, Aug 04, 2012 at 11:56:35PM +0200, Rafael J. Wysocki wrote:
> On Thursday, August 02, 2012, Konrad Rzeszutek Wilk wrote:
> > If the machine is booted without any cpu_idle driver set
> > (b/c disable_cpuidle() has been called) we should follow
> > other users of cpu_idle API and check the return value
> > for NULL before using it.
> >
> > Reported-by: Mark van Dijk <mark@internecto.net>
> > Tested-by: Mark van Dijk <mark@internecto.net>
> > Suggested-by: Jan Beulich <JBeulich@suse.com>
> > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > ---
> > drivers/idle/intel_idle.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
> > index f559088..7383aa0 100644
> > --- a/drivers/idle/intel_idle.c
> > +++ b/drivers/idle/intel_idle.c
> > @@ -607,7 +607,7 @@ static int __init intel_idle_init(void)
> > retval = cpuidle_register_driver(&intel_idle_driver);
> > if (retval) {
>
> What about:
>
> struct cpuidle_driver *drv = cpuidle_get_driver();
>
> printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
> drv ? drv->name : "none");
>
> > printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
> > - cpuidle_get_driver()->name);
> > + cpuidle_get_driver() ? cpuidle_get_driver()->name : "none");
> > return retval;
> > }
> >
> >
>
> Rafael
Here it is:
>From a8b7aa06cacb5f42a90a0d4a0a1a95e230d43fc6 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 2 Aug 2012 10:31:52 -0400
Subject: [PATCH] intel_idle: Check cpu_idle_get_driver() for NULL before
dereferencing it.
If the machine is booted without any cpu_idle driver set
(b/c disable_cpuidle() has been called) we should follow
other users of cpu_idle API and check the return value
for NULL before using it.
Reported-by: Mark van Dijk <mark@internecto.net>
Tested-by: Mark van Dijk <mark@internecto.net>
Suggested-by: Jan Beulich <JBeulich@suse.com>
[v1: Redo per Rafael's suggestion]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
drivers/idle/intel_idle.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index d0f59c3..6b313af 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -556,8 +556,9 @@ static int __init intel_idle_init(void)
intel_idle_cpuidle_driver_init();
retval = cpuidle_register_driver(&intel_idle_driver);
if (retval) {
+ struct cpuidle_driver *drv = cpuidle_get_driver();
printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
- cpuidle_get_driver()->name);
+ drv ? drv->name : "none");
return retval;
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it.
2012-08-06 14:50 ` Konrad Rzeszutek Wilk
@ 2012-08-16 20:19 ` Rafael J. Wysocki
0 siblings, 0 replies; 5+ messages in thread
From: Rafael J. Wysocki @ 2012-08-16 20:19 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk; +Cc: lenb, linux-pm, linux-kernel
On Monday, August 06, 2012, Konrad Rzeszutek Wilk wrote:
> On Sat, Aug 04, 2012 at 11:56:35PM +0200, Rafael J. Wysocki wrote:
> > On Thursday, August 02, 2012, Konrad Rzeszutek Wilk wrote:
> > > If the machine is booted without any cpu_idle driver set
> > > (b/c disable_cpuidle() has been called) we should follow
> > > other users of cpu_idle API and check the return value
> > > for NULL before using it.
> > >
> > > Reported-by: Mark van Dijk <mark@internecto.net>
> > > Tested-by: Mark van Dijk <mark@internecto.net>
> > > Suggested-by: Jan Beulich <JBeulich@suse.com>
> > > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > > ---
> > > drivers/idle/intel_idle.c | 2 +-
> > > 1 files changed, 1 insertions(+), 1 deletions(-)
> > >
> > > diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
> > > index f559088..7383aa0 100644
> > > --- a/drivers/idle/intel_idle.c
> > > +++ b/drivers/idle/intel_idle.c
> > > @@ -607,7 +607,7 @@ static int __init intel_idle_init(void)
> > > retval = cpuidle_register_driver(&intel_idle_driver);
> > > if (retval) {
> >
> > What about:
> >
> > struct cpuidle_driver *drv = cpuidle_get_driver();
> >
> > printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
> > drv ? drv->name : "none");
> >
> > > printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
> > > - cpuidle_get_driver()->name);
> > > + cpuidle_get_driver() ? cpuidle_get_driver()->name : "none");
> > > return retval;
> > > }
> > >
> > >
> >
> > Rafael
>
> Here it is:
>
> From a8b7aa06cacb5f42a90a0d4a0a1a95e230d43fc6 Mon Sep 17 00:00:00 2001
> From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Date: Thu, 2 Aug 2012 10:31:52 -0400
> Subject: [PATCH] intel_idle: Check cpu_idle_get_driver() for NULL before
> dereferencing it.
>
> If the machine is booted without any cpu_idle driver set
> (b/c disable_cpuidle() has been called) we should follow
> other users of cpu_idle API and check the return value
> for NULL before using it.
>
> Reported-by: Mark van Dijk <mark@internecto.net>
> Tested-by: Mark van Dijk <mark@internecto.net>
> Suggested-by: Jan Beulich <JBeulich@suse.com>
> [v1: Redo per Rafael's suggestion]
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Applied to the linux-next branch of the linux-pm.git tree as v3.6 material.
Thanks,
Rafael
> ---
> drivers/idle/intel_idle.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
> index d0f59c3..6b313af 100644
> --- a/drivers/idle/intel_idle.c
> +++ b/drivers/idle/intel_idle.c
> @@ -556,8 +556,9 @@ static int __init intel_idle_init(void)
> intel_idle_cpuidle_driver_init();
> retval = cpuidle_register_driver(&intel_idle_driver);
> if (retval) {
> + struct cpuidle_driver *drv = cpuidle_get_driver();
> printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
> - cpuidle_get_driver()->name);
> + drv ? drv->name : "none");
> return retval;
> }
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-08-16 20:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-02 14:39 [PATCH] intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it Konrad Rzeszutek Wilk
2012-08-04 21:56 ` Rafael J. Wysocki
2012-08-06 14:33 ` Konrad Rzeszutek Wilk
2012-08-06 14:50 ` Konrad Rzeszutek Wilk
2012-08-16 20:19 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox