lkml.org 
[lkml]   [2012]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[v2.6.34-stable 125/165] PM / Suspend: Off by one in pm_suspend()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    http://git.kernel.org/?p=linux/kernel/git/paulg/longterm-queue-2.6.34.git
    If you see a problem with using this for longterm, please comment.
    -------------------

    commit 528f7ce6e439edeac38f6b3f8561f1be129b5e91 upstream.

    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>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    kernel/power/suspend.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
    index 56e7dbb..7d4ae3b 100644
    --- a/kernel/power/suspend.c
    +++ b/kernel/power/suspend.c
    @@ -297,7 +297,7 @@ int enter_state(suspend_state_t state)
    */
    int pm_suspend(suspend_state_t state)
    {
    - if (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX)
    + if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX)
    return enter_state(state);
    return -EINVAL;
    }
    --
    1.7.12.rc2


    \
     
     \ /
      Last update: 2012-08-16 01:42    [W:3.642 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site