lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 042/122] PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlock
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.5-stable review patch. If anyone has any objections, please let me know.

    ------------------

    From: "Rafael J. Wysocki" <rjw@sisk.pl>

    commit 11388c87d2abca1f01975ced28ce9eacea239104 upstream.

    Require processes wanting to use the wake_lock/wake_unlock sysfs
    files to have the CAP_BLOCK_SUSPEND capability, which also is
    required for the eventpoll EPOLLWAKEUP flag to be effective, so that
    all interfaces related to blocking autosleep depend on the same
    capability.

    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Michael Kerrisk <mtk.man-pages@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    kernel/power/wakelock.c | 7 +++++++
    1 file changed, 7 insertions(+)

    --- a/kernel/power/wakelock.c
    +++ b/kernel/power/wakelock.c
    @@ -9,6 +9,7 @@
    * manipulate wakelocks on Android.
    */

    +#include <linux/capability.h>
    #include <linux/ctype.h>
    #include <linux/device.h>
    #include <linux/err.h>
    @@ -188,6 +189,9 @@ int pm_wake_lock(const char *buf)
    size_t len;
    int ret = 0;

    + if (!capable(CAP_BLOCK_SUSPEND))
    + return -EPERM;
    +
    while (*str && !isspace(*str))
    str++;

    @@ -231,6 +235,9 @@ int pm_wake_unlock(const char *buf)
    size_t len;
    int ret = 0;

    + if (!capable(CAP_BLOCK_SUSPEND))
    + return -EPERM;
    +
    len = strlen(buf);
    if (!len)
    return -EINVAL;



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