* [patch] suspend: off by one in pm_suspend()
@ 2011-09-20 7:03 Dan Carpenter
2011-09-21 19:02 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2011-09-20 7:03 UTC (permalink / raw)
To: kernel-janitors
In enter_state() we use "state" as an offset for the pm_states[]
array. The pm_states[] array only has PM_SUSPEND_MAX elements so
this test is off by one.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 1d58583..4953dc0 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -321,7 +321,7 @@ int enter_state(suspend_state_t state)
int pm_suspend(suspend_state_t state)
{
int ret;
- if (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX) {
+ if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX) {
ret = enter_state(state);
if (ret) {
suspend_stats.fail++;
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [patch] suspend: off by one in pm_suspend()
2011-09-20 7:03 [patch] suspend: off by one in pm_suspend() Dan Carpenter
@ 2011-09-21 19:02 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2011-09-21 19:02 UTC (permalink / raw)
To: kernel-janitors
On Tuesday, September 20, 2011, Dan Carpenter wrote:
> In enter_state() we use "state" as an offset for the pm_states[]
> array. The pm_states[] array only has PM_SUSPEND_MAX elements so
> this test is off by one.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied to linux-pm/linux-next, will be pushed for 3.2.
Thanks,
Rafael
> diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
> index 1d58583..4953dc0 100644
> --- a/kernel/power/suspend.c
> +++ b/kernel/power/suspend.c
> @@ -321,7 +321,7 @@ int enter_state(suspend_state_t state)
> int pm_suspend(suspend_state_t state)
> {
> int ret;
> - if (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX) {
> + if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX) {
> ret = enter_state(state);
> if (ret) {
> suspend_stats.fail++;
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-21 19:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-20 7:03 [patch] suspend: off by one in pm_suspend() Dan Carpenter
2011-09-21 19:02 ` 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