lkml.org 
[lkml]   [2006]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 15/30] Input: psmouse - fix attribute access on 64-bit systems
    -stable review patch.  If anyone has any objections, please let us know.
    ------------------

    From: Sergey Vlasov <vsu@altlinux.ru>

    psmouse_show_int_attr() and psmouse_set_int_attr() were accessing
    unsigned int fields as unsigned long, which gave garbage on x86_64.

    Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    ---
    drivers/input/mouse/psmouse-base.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    The problem was found in 2.6.18.2; the same patch applies to the
    current tree.

    --- linux-2.6.18.2.orig/drivers/input/mouse/psmouse-base.c
    +++ linux-2.6.18.2/drivers/input/mouse/psmouse-base.c
    @@ -1332,20 +1332,22 @@ ssize_t psmouse_attr_set_helper(struct d

    static ssize_t psmouse_show_int_attr(struct psmouse *psmouse, void *offset, char *buf)
    {
    - unsigned long *field = (unsigned long *)((char *)psmouse + (size_t)offset);
    + unsigned int *field = (unsigned int *)((char *)psmouse + (size_t)offset);

    - return sprintf(buf, "%lu\n", *field);
    + return sprintf(buf, "%u\n", *field);
    }

    static ssize_t psmouse_set_int_attr(struct psmouse *psmouse, void *offset, const char *buf, size_t count)
    {
    - unsigned long *field = (unsigned long *)((char *)psmouse + (size_t)offset);
    + unsigned int *field = (unsigned int *)((char *)psmouse + (size_t)offset);
    unsigned long value;
    char *rest;

    value = simple_strtoul(buf, &rest, 10);
    if (*rest)
    return -EINVAL;
    + if ((unsigned int)value != value)
    + return -EINVAL;

    *field = value;

    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-11-16 03:49    [W:2.117 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site