From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx07-00376f01.pphosted.com (mx07-00376f01.pphosted.com [185.132.180.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93D55288CA6 for ; Wed, 9 Jul 2025 10:04:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.132.180.163 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752055502; cv=none; b=aHdaLgOds/fXW8I6oWnkWPqaJWShIrL3UQPw0PeZ81Y+MkdDg7lWg/j2FcpMQvLdusdW09A5LBOnLSj68aCLEydavBOFHjCXmdPOK9T3S9DaIVJIKuFOAxz3+iBOFvWju6zc5roJDTSvslBocDjDUQEolSbV14XFzqsjy4ntToY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752055502; c=relaxed/simple; bh=AAhsaKXoeTKToXDgfqzCr2N3fPxs3y7JThutds5j/Tc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=uhvWRDyEh0IRr6RrdXqMW44/IbJM2gaBRDH94I4EA2t3mrWUdxbzhRqmlH1ZVmAT83r+5WSfjLpx1+SVY06rV3nzC01E+Fs/yiugSrC7Zvuoz8YxWuJQm3Okx4vUI8XHiWhpCrFhrD8MzPU3Yycz0RQiC+oonkQAgeBSI6k+quI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=imgtec.com; spf=pass smtp.mailfrom=imgtec.com; dkim=pass (2048-bit key) header.d=imgtec.com header.i=@imgtec.com header.b=ulbW41wN; arc=none smtp.client-ip=185.132.180.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=imgtec.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=imgtec.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=imgtec.com header.i=@imgtec.com header.b="ulbW41wN" Received: from pps.filterd (m0168889.ppops.net [127.0.0.1]) by mx07-00376f01.pphosted.com (8.18.1.8/8.18.1.8) with ESMTP id 5694tX8i317115; Wed, 9 Jul 2025 11:04:35 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=imgtec.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=dk201812; bh=F xD1z5yPidGXrQ4pKEj7IdqHsdw2txmMPZDo/Il/3jE=; b=ulbW41wNYgWLIfp3t WqysebVx4F/HC8ptQin9SsVkfpiwBE+27MgCe9HzWX1us9PbYg1ZtfdB7N6VmecP Hss5I/Vf5JN3s2ot5DkAW+/IVG7PxIdLGlWzEqK7pub2D+6M3xbNHwJdvvSW2gHZ ouXqsoF4IOas0QUo5QeFkHyTN0gW2qCuTwldOOpaTlD8DVgiL//Y+aDl1+i96Hnu xxh5QORlCsvn2a6jpjHsJMJ12KuuKDBYMRkPWWTe4WwP7kywOf9yBNWfQ8YkWQK6 TIqN99fwW184farVTlYh4pj2SXWJhixYJmO6ZTnY9zgm823kT5OIxB1M/STqMX4I bGkog== Received: from hhmail05.hh.imgtec.org (83-244-153-141.cust-83.exponential-e.net [83.244.153.141]) by mx07-00376f01.pphosted.com (PPS) with ESMTPS id 47pv4t3q37-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Wed, 09 Jul 2025 11:04:34 +0100 (BST) Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa (172.25.2.134) by HHMAIL05.hh.imgtec.org (10.100.10.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Wed, 9 Jul 2025 11:04:32 +0100 From: Matt Coster Date: Wed, 9 Jul 2025 11:04:10 +0100 Subject: [PATCH 2/2] drm/imagination: Use struct_size_t() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-ID: <20250709-flex-array-check-v1-2-8adeb0bf0cde@imgtec.com> References: <20250709-flex-array-check-v1-0-8adeb0bf0cde@imgtec.com> In-Reply-To: <20250709-flex-array-check-v1-0-8adeb0bf0cde@imgtec.com> To: Frank Binns , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter CC: , , "Matt Coster" X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1660; i=matt.coster@imgtec.com; h=from:subject:message-id; bh=AAhsaKXoeTKToXDgfqzCr2N3fPxs3y7JThutds5j/Tc=; b=owGbwMvMwCFWuUfy8817WRsYT6slMWTk2a0/wlO/6PQMXQ8//VPPJ/wNZe7Qe2LVtOn629mXD JZ1bWNg6yhlYRDjYJAVU2TZscJyhdofNS2JG7+KYeawMoEMYeDiFICJROxiZHjUdLyHg+2fbJHw 4YWsdddK9b5u9fzWWs9wfftj5rlZNdcZfrP8VF4gll3B0JFkmPR7R/MmDSXuvLlfDI95L+jJPup jywQA X-Developer-Key: i=matt.coster@imgtec.com; a=openpgp; fpr=05A40CFCE7269D61D97100A1747F0A9036F90DFA X-EXCLAIMER-MD-CONFIG: 15a78312-3e47-46eb-9010-2e54d84a9631 X-Proofpoint-GUID: K5oXViUFKwd7h8LrljoQThUFr5ttJy_7 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA1MDAyMCBTYWx0ZWRfX756bTb+Ytbjs PmlYgaI4E6/MXiL4IlXEQHUOe1+5yQeOh0dL51KkD9Wz6sB0YLxLABLwIUFE8BIj8Mw8n0rNZtX I650tKMC1sUhpdfCZaU1+tuSqincdauhQxzmaiCEcwR4c2FKbTAPBmj1Or/WXqV/w3bLJqUYIEB ufxTGJBkHNQVpK6UMRiA8x9Jw6OHjExmP6RiDw8gQSQanjHfuNJkTIDudHk55ZXJnp4bJdgYl6I 9c9ftfYWiHAQRhT51QTdWRTPlTDzLfaP8JQIUZ3X4Psr7oxf57W5xJWxa7ThxjzaDmPp5jvsqsv SZsC0lFaHzwkfCGyPnkw8c4qn5VFv25vgQ6PLUsYl5Ki3qC/QKPE4hJIkU/zunk7PfMwsXfrVIB nFQiMEx2 X-Proofpoint-ORIG-GUID: K5oXViUFKwd7h8LrljoQThUFr5ttJy_7 X-Authority-Analysis: v=2.4 cv=fMw53Yae c=1 sm=1 tr=0 ts=686e3eb2 cx=c_pps a=AKOq//PuzOIrVTIF9yBwbA==:117 a=AKOq//PuzOIrVTIF9yBwbA==:17 a=OXfeAiaCWNgA:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=r_1tXGB3AAAA:8 a=yjSvmlsFm-r5wrLTlc4A:9 a=QEXdDO2ut3YA:10 a=t8nPyN_e6usw4ciXM-Pk:22 The helpers for dealing with flexible structures exist, so let's use them. Signed-off-by: Matt Coster --- drivers/gpu/drm/imagination/pvr_queue.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/imagination/pvr_queue.c b/drivers/gpu/drm/imagination/pvr_queue.c index 5a41ee79fed646a86344cd16e78efdb45ff02e43..094a854576a5a63f56e56acdebf01bdf542ae4d5 100644 --- a/drivers/gpu/drm/imagination/pvr_queue.c +++ b/drivers/gpu/drm/imagination/pvr_queue.c @@ -3,6 +3,7 @@ #include #include +#include #include "pvr_cccb.h" #include "pvr_context.h" @@ -35,9 +36,8 @@ static int get_xfer_ctx_state_size(struct pvr_device *pvr_dev) return err; } - return sizeof(struct rogue_fwif_frag_ctx_state) + - (num_isp_store_registers * - sizeof(((struct rogue_fwif_frag_ctx_state *)0)->frag_reg_isp_store[0])); + return struct_size_t(struct rogue_fwif_frag_ctx_state, + frag_reg_isp_store, num_isp_store_registers); } static int get_frag_ctx_state_size(struct pvr_device *pvr_dev) @@ -65,9 +65,8 @@ static int get_frag_ctx_state_size(struct pvr_device *pvr_dev) return err; } - return sizeof(struct rogue_fwif_frag_ctx_state) + - (num_isp_store_registers * - sizeof(((struct rogue_fwif_frag_ctx_state *)0)->frag_reg_isp_store[0])); + return struct_size_t(struct rogue_fwif_frag_ctx_state, + frag_reg_isp_store, num_isp_store_registers); } static int get_ctx_state_size(struct pvr_device *pvr_dev, enum drm_pvr_job_type type) -- 2.50.1