lkml.org 
[lkml]   [2013]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 074/104] HID: battery: don't do DMA from stack
    Date
    3.5.7.22 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Jiri Kosina <jkosina@suse.cz>

    commit 6c2794a2984f4c17a58117a68703cc7640f01c5a upstream.

    Instead of using data from stack for DMA in hidinput_get_battery_property(),
    allocate the buffer dynamically.

    Reported-by: Richard Ryniker <ryniker@alum.mit.edu>
    Reported-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/hid/hid-input.c | 12 ++++++++++--
    1 file changed, 10 insertions(+), 2 deletions(-)

    diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
    index 73f2f7c..c460b74 100644
    --- a/drivers/hid/hid-input.c
    +++ b/drivers/hid/hid-input.c
    @@ -325,7 +325,7 @@ static int hidinput_get_battery_property(struct power_supply *psy,
    {
    struct hid_device *dev = container_of(psy, struct hid_device, battery);
    int ret = 0;
    - __u8 buf[2] = {};
    + __u8 *buf;

    switch (prop) {
    case POWER_SUPPLY_PROP_PRESENT:
    @@ -334,12 +334,19 @@ static int hidinput_get_battery_property(struct power_supply *psy,
    break;

    case POWER_SUPPLY_PROP_CAPACITY:
    +
    + buf = kmalloc(2 * sizeof(__u8), GFP_KERNEL);
    + if (!buf) {
    + ret = -ENOMEM;
    + break;
    + }
    ret = dev->hid_get_raw_report(dev, dev->battery_report_id,
    - buf, sizeof(buf),
    + buf, 2,
    dev->battery_report_type);

    if (ret != 2) {
    ret = -ENODATA;
    + kfree(buf);
    break;
    }
    ret = 0;
    @@ -349,6 +356,7 @@ static int hidinput_get_battery_property(struct power_supply *psy,
    buf[1] <= dev->battery_max)
    val->intval = (100 * (buf[1] - dev->battery_min)) /
    (dev->battery_max - dev->battery_min);
    + kfree(buf);
    break;

    case POWER_SUPPLY_PROP_MODEL_NAME:
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-09-30 13:21    [W:3.333 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site