]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
platform/x86: intel_mid_powerbtn: Take a copy of ddata
authorMika Westerberg <mika.westerberg@linux.intel.com>
Wed, 22 Jan 2020 16:05:20 +0000 (19:05 +0300)
committerKhalid Elmously <khalid.elmously@canonical.com>
Fri, 13 Mar 2020 04:31:00 +0000 (00:31 -0400)
BugLink: https://bugs.launchpad.net/bugs/1866678
commit 5e0c94d3aeeecc68c573033f08d9678fecf253bd upstream.

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/platform/x86/intel_mid_powerbtn.c

index 5ad44204a9c3c997bf237aacfb1bbb99ab292ef7..10dbd6cac48aedea426d0cf8b525c7717ffd23b4 100644 (file)
@@ -158,9 +158,10 @@ static int mid_pb_probe(struct platform_device *pdev)
 
        input_set_capability(input, EV_KEY, KEY_POWER);
 
 
        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)
        if (!ddata)
-               return -ENODATA;
+               return -ENOMEM;
 
        ddata->dev = &pdev->dev;
        ddata->irq = irq;
 
        ddata->dev = &pdev->dev;
        ddata->irq = irq;