Skip to content

Commit 8758553

Browse files
GustavoARSilvajoergroedel
authored andcommitted
iommu/qcom: Use struct_size() helper
One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example: struct qcom_iommu_dev { ... struct qcom_iommu_ctx *ctxs[0]; /* indexed by asid-1 */ }; Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes. So, replace the following form: sizeof(*qcom_iommu) + (max_asid * sizeof(qcom_iommu->ctxs[0])) with: struct_size(qcom_iommu, ctxs, max_asid) Also, notice that, in this case, variable sz is not necessary, hence it is removed. This code was detected with the help of Coccinelle. Signed-off-by: Gustavo A. R. Silva <[email protected]> Signed-off-by: Joerg Roedel <[email protected]>
1 parent a55aa89 commit 8758553

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

drivers/iommu/qcom_iommu.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -775,17 +775,16 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
775775
struct qcom_iommu_dev *qcom_iommu;
776776
struct device *dev = &pdev->dev;
777777
struct resource *res;
778-
int ret, sz, max_asid = 0;
778+
int ret, max_asid = 0;
779779

780780
/* find the max asid (which is 1:1 to ctx bank idx), so we know how
781781
* many child ctx devices we have:
782782
*/
783783
for_each_child_of_node(dev->of_node, child)
784784
max_asid = max(max_asid, get_asid(child));
785785

786-
sz = sizeof(*qcom_iommu) + (max_asid * sizeof(qcom_iommu->ctxs[0]));
787-
788-
qcom_iommu = devm_kzalloc(dev, sz, GFP_KERNEL);
786+
qcom_iommu = devm_kzalloc(dev, struct_size(qcom_iommu, ctxs, max_asid),
787+
GFP_KERNEL);
789788
if (!qcom_iommu)
790789
return -ENOMEM;
791790
qcom_iommu->num_ctxs = max_asid;

0 commit comments

Comments
 (0)