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>

diff --git a/drivers/platform/surface/surface_acpi_notify.c b/drivers/platform/surface/surface_acpi_notify.c
index 44e31797055724d085ef5742dfbe47cc8fbba12b..50500e562963d6027553aabf6678c7e9fd23bf73 100644 (file)
--- 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;