diff options
| author |   Kees Cook <keescook@chromium.org> | 2022-09-26 17:40:11 -0700 |
|---|---|---|
| committer |   Hans de Goede <hdegoede@redhat.com> | 2022-09-27 15:14:53 +0200 |
| commit | a776bf77c98ddea32233e2480f565797900975ba (patch) | |
| tree | ec377c3566732e889b897f245dc04d89c90d8e9e /drivers | |
| parent | platform/x86: compal-laptop: Get rid of a few forward declarations (diff) | |
| download | linux-dev-a776bf77c98ddea32233e2480f565797900975ba.tar.xz linux-dev-a776bf77c98ddea32233e2480f565797900975ba.zip | |
platform/surface: Split memcpy() of struct ssam_event flexible array
To work around a misbehavior of the compiler's ability to see into
composite flexible array structs (as detailed in the coming memcpy()
hardening series[1]), split the memcpy() of the header and the payload
so no false positive run-time overflow warning will be generated.
[1] https://lore.kernel.org/linux-hardening/20220901065914.1417829-2-keescook@chromium.org
Cc: Maximilian Luz <luzmaximilian@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Mark Gross <markgross@kernel.org>
Cc: platform-driver-x86@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Maximilian Luz <luzmaximilian@gmail.com>
Link: https://lore.kernel.org/r/20220927004011.1942739-1-keescook@chromium.org
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/surface/surface_acpi_notify.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/surface/surface_acpi_notify.c b/drivers/platform/surface/surface_acpi_notify.c index 44e317970557..50500e562963 100644 --- a/drivers/platform/surface/surface_acpi_notify.c +++ b/drivers/platform/surface/surface_acpi_notify.c @@ -355,7 +355,8 @@ static u32 san_evt_bat_nf(struct ssam_event_notifier *nf, INIT_DELAYED_WORK(&work->work, san_evt_bat_workfn); work->dev = d->dev; - memcpy(&work->event, event, sizeof(struct ssam_event) + event->length); + work->event = *event; + memcpy(work->event.data, event->data, event->length); queue_delayed_work(san_wq, &work->work, delay); return SSAM_NOTIF_HANDLED; |