lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 153/186] platform/x86: intel_mid_powerbtn: Take a copy of ddata
    Date
    From: Mika Westerberg <mika.westerberg@linux.intel.com>

    [ Upstream commit 5e0c94d3aeeecc68c573033f08d9678fecf253bd ]

    The driver gets driver_data from memory that is marked as const (which
    is probably put to read-only memory) and it then modifies it. This
    likely causes some sort of fault to happen.

    Fix this by taking a copy of the structure.

    Fixes: c94a8ff14de3 ("platform/x86: intel_mid_powerbtn: make mid_pb_ddata const")
    Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/platform/x86/intel_mid_powerbtn.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c
    index 5ad44204a9c3c..10dbd6cac48ae 100644
    --- a/drivers/platform/x86/intel_mid_powerbtn.c
    +++ b/drivers/platform/x86/intel_mid_powerbtn.c
    @@ -158,9 +158,10 @@ static int mid_pb_probe(struct platform_device *pdev)

    input_set_capability(input, EV_KEY, KEY_POWER);

    - ddata = (struct mid_pb_ddata *)id->driver_data;
    + ddata = devm_kmemdup(&pdev->dev, (void *)id->driver_data,
    + sizeof(*ddata), GFP_KERNEL);
    if (!ddata)
    - return -ENODATA;
    + return -ENOMEM;

    ddata->dev = &pdev->dev;
    ddata->irq = irq;
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 17:49    [W:4.158 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site