drm/nouveau: outp: Use __member_size() helper

Use __member_size() to get the size of the flex-array member at compile
time, instead of the convoluted expression `__struct_size(p) - sizeof(*p)`

Link: https://lore.kernel.org/r/aAe5o_-f5OYSTXjZ@kspp
Reviewed-by: Kees Cook <kees@kernel.org>
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>

diff --git a/drivers/gpu/drm/nouveau/nvif/outp.c b/drivers/gpu/drm/nouveau/nvif/outp.c
index 1ea20b2bdd29fff80936323bdddc6e8c5bcb67af..32f6c5eb92af01d0573f31c6f7a9d2b117ddf365 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvif/outp.c
+++ b/drivers/gpu/drm/nouveau/nvif/outp.c
@@ -198,7 +198,7 @@ nvif_outp_hda_eld(struct nvif_outp *outp, int head, void *data, u32 size)
        DEFINE_RAW_FLEX(struct nvif_outp_hda_eld_v0, mthd, data, 128);
        int ret;
 
-       if (WARN_ON(size > (__struct_size(mthd) - sizeof(*mthd))))
+       if (WARN_ON(size > __member_size(mthd->data)))
                return -EINVAL;
 
        mthd->version = 0;