Merge branch 'for-5.18/google' into for-linus

diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c
index 0403beb..ddbe0de 100644 (file)
--- a/drivers/hid/hid-google-hammer.c
+++ b/drivers/hid/hid-google-hammer.c
@@ -58,7 +58,7 @@ static int cbas_ec_query_base(struct cros_ec_device *ec_dev, bool get_state,
        struct cros_ec_command *msg;
        int ret;
 
-       msg = kzalloc(sizeof(*msg) + max(sizeof(u32), sizeof(*params)),
+       msg = kzalloc(struct_size(msg, data, max(sizeof(u32), sizeof(*params))),
                      GFP_KERNEL);
        if (!msg)
                return -ENOMEM;