lkml.org 
[lkml]   [2009]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/14] USB: mos7840: fix DMA buffers on stack and endianess bugs
    Date

    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    ---
    drivers/usb/serial/mos7840.c | 22 ++++++++++++++++++----
    1 files changed, 18 insertions(+), 4 deletions(-)
    diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
    index 2cfe245..04bef4b 100644
    --- a/drivers/usb/serial/mos7840.c
    +++ b/drivers/usb/serial/mos7840.c
    @@ -283,12 +283,19 @@ static int mos7840_get_reg_sync(struct usb_serial_port *port, __u16 reg,
    {
    struct usb_device *dev = port->serial->dev;
    int ret = 0;
    + u8 *buf;
    +
    + buf = kmalloc(VENDOR_READ_LENGTH, GFP_KERNEL);
    + if (!buf)
    + return -ENOMEM;

    ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), MCS_RDREQ,
    - MCS_RD_RTYPE, 0, reg, val, VENDOR_READ_LENGTH,
    + MCS_RD_RTYPE, 0, reg, buf, VENDOR_READ_LENGTH,
    MOS_WDR_TIMEOUT);
    + *val = buf[0];
    dbg("mos7840_get_reg_sync offset is %x, return val %x", reg, *val);
    - *val = (*val) & 0x00ff;
    +
    + kfree(buf);
    return ret;
    }

    @@ -341,6 +348,11 @@ static int mos7840_get_uart_reg(struct usb_serial_port *port, __u16 reg,
    struct usb_device *dev = port->serial->dev;
    int ret = 0;
    __u16 Wval;
    + u8 *buf;
    +
    + buf = kmalloc(VENDOR_READ_LENGTH, GFP_KERNEL);
    + if (!buf)
    + return -ENOMEM;

    /* dbg("application number is %4x",
    (((__u16)port->number - (__u16)(port->serial->minor))+1)<<8); */
    @@ -364,9 +376,11 @@ static int mos7840_get_uart_reg(struct usb_serial_port *port, __u16 reg,
    }
    }
    ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), MCS_RDREQ,
    - MCS_RD_RTYPE, Wval, reg, val, VENDOR_READ_LENGTH,
    + MCS_RD_RTYPE, Wval, reg, buf, VENDOR_READ_LENGTH,
    MOS_WDR_TIMEOUT);
    - *val = (*val) & 0x00ff;
    + *val = buf[0];
    +
    + kfree(buf);
    return ret;
    }

    --
    1.6.6


    \
     
     \ /
      Last update: 2009-12-28 23:07    [W:0.277 / U:0.276 seconds]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean