From: Gustavo A. R. Silva Date: Tue, 22 Apr 2025 15:44:56 +0000 (-0600) Subject: drm/nouveau: disp: Use __member_size() helper X-Git-Tag: v6.16-rc1~144^2~16^2~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7435cf2d9b6b33bf132e0d96b14d723c610f9c3;p=thirdparty%2Flinux.git drm/nouveau: disp: 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/aAe5eNDnRyGnxLMX@kspp Reviewed-by: Kees Cook Signed-off-by: Gustavo A. R. Silva Signed-off-by: Danilo Krummrich --- diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 725331638a15d..9bed728cb00e4 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -776,7 +776,7 @@ nv50_hdmi_enable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc, const u8 rekey = 56; /* binary driver, and tegra, constant */ u32 max_ac_packet; DEFINE_RAW_FLEX(struct nvif_outp_infoframe_v0, args, data, 17); - const u8 data_len = __struct_size(args) - sizeof(*args); + const u8 data_len = __member_size(args->data); int ret, size; max_ac_packet = mode->htotal - mode->hdisplay;