lkml.org 
[lkml]   [2013]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 091/102] ipmi: ipmi_devintf: compat_ioctl method fails to take ipmi_mutex
    Date
    3.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Benjamin LaHaise <bcrl@kvack.org>

    commit 6368087e851e697679af059b4247aca33a69cef3 upstream.

    When a 32 bit version of ipmitool is used on a 64 bit kernel, the
    ipmi_devintf code fails to correctly acquire ipmi_mutex. This results in
    incomplete data being retrieved in some cases, or other possible failures.
    Add a wrapper around compat_ipmi_ioctl() to take ipmi_mutex to fix this.

    Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
    Signed-off-by: Corey Minyard <cminyard@mvista.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/char/ipmi/ipmi_devintf.c | 14 +++++++++++++-
    1 file changed, 13 insertions(+), 1 deletion(-)

    --- a/drivers/char/ipmi/ipmi_devintf.c
    +++ b/drivers/char/ipmi/ipmi_devintf.c
    @@ -837,13 +837,25 @@ static long compat_ipmi_ioctl(struct fil
    return ipmi_ioctl(filep, cmd, arg);
    }
    }
    +
    +static long unlocked_compat_ipmi_ioctl(struct file *filep, unsigned int cmd,
    + unsigned long arg)
    +{
    + int ret;
    +
    + mutex_lock(&ipmi_mutex);
    + ret = compat_ipmi_ioctl(filep, cmd, arg);
    + mutex_unlock(&ipmi_mutex);
    +
    + return ret;
    +}
    #endif

    static const struct file_operations ipmi_fops = {
    .owner = THIS_MODULE,
    .unlocked_ioctl = ipmi_unlocked_ioctl,
    #ifdef CONFIG_COMPAT
    - .compat_ioctl = compat_ipmi_ioctl,
    + .compat_ioctl = unlocked_compat_ipmi_ioctl,
    #endif
    .open = ipmi_open,
    .release = ipmi_release,



    \
     
     \ /
      Last update: 2013-05-18 00:21    [W:4.068 / U:0.684 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site