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 092/165] carminefb: Fix module parameters permissions
    Date
    From: Jean Delvare <jdelvare@suse.de>

    -------------------
    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 c84c14224bbca6ec60d5851fcc87be0e34df2f44 upstream.

    The third parameter of module_param is supposed to be an octal value.
    The missing leading "0" causes the following:

    $ ls -l /sys/module/carminefb/parameters/
    total 0
    -rw-rwxr-- 1 root root 4096 Jul 8 08:55 fb_displays
    -rw-rwxr-- 1 root root 4096 Jul 8 08:55 fb_mode
    -rw-rwxr-- 1 root root 4096 Jul 8 08:55 fb_mode_str

    After fixing the perm parameter, we get the expected:

    $ ls -l /sys/module/carminefb/parameters/
    total 0
    -r--r--r-- 1 root root 4096 Jul 8 08:56 fb_displays
    -r--r--r-- 1 root root 4096 Jul 8 08:56 fb_mode
    -r--r--r-- 1 root root 4096 Jul 8 08:56 fb_mode_str

    Signed-off-by: Jean Delvare <jdelvare@suse.de>
    Cc: Paul Mundt <lethal@linux-sh.org>
    Cc: Sebastian Siewior <bigeasy@linutronix.de>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/video/carminefb.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c
    index d8345fc..96b52a4 100644
    --- a/drivers/video/carminefb.c
    +++ b/drivers/video/carminefb.c
    @@ -32,11 +32,11 @@
    #define CARMINEFB_DEFAULT_VIDEO_MODE 1

    static unsigned int fb_mode = CARMINEFB_DEFAULT_VIDEO_MODE;
    -module_param(fb_mode, uint, 444);
    +module_param(fb_mode, uint, 0444);
    MODULE_PARM_DESC(fb_mode, "Initial video mode as integer.");

    static char *fb_mode_str;
    -module_param(fb_mode_str, charp, 444);
    +module_param(fb_mode_str, charp, 0444);
    MODULE_PARM_DESC(fb_mode_str, "Initial video mode in characters.");

    /*
    @@ -46,7 +46,7 @@ MODULE_PARM_DESC(fb_mode_str, "Initial video mode in characters.");
    * 0b010 Display 1
    */
    static int fb_displays = CARMINE_USE_DISPLAY0 | CARMINE_USE_DISPLAY1;
    -module_param(fb_displays, int, 444);
    +module_param(fb_displays, int, 0444);
    MODULE_PARM_DESC(fb_displays, "Bit mode, which displays are used");

    struct carmine_hw {
    --
    1.7.12.rc2


    \
     
     \ /
      Last update: 2012-08-15 23:43    [W:4.163 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site