* [PATCH] soc: qcom: smem: Use struct_size()
@ 2023-07-12 20:42 Christophe JAILLET
2023-07-12 22:40 ` Kees Cook
2023-07-14 5:33 ` Bjorn Andersson
0 siblings, 2 replies; 3+ messages in thread
From: Christophe JAILLET @ 2023-07-12 20:42 UTC (permalink / raw)
To: keescook, Andy Gross, Bjorn Andersson, Konrad Dybcio
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, linux-arm-msm
Use struct_size() instead of hand-writing it, when allocating a structure
with a flex array.
This is less verbose.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
It will also be helpful if the __counted_by() annotation is added with a
Coccinelle script such as:
https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git/commit/?h=devel/counted_by&id=adc5b3cb48a049563dc673f348eab7b6beba8a9b
---
drivers/soc/qcom/smem.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
index b0d59e815c3b..776096b2e965 100644
--- a/drivers/soc/qcom/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -1059,7 +1059,6 @@ static int qcom_smem_probe(struct platform_device *pdev)
struct reserved_mem *rmem;
struct qcom_smem *smem;
unsigned long flags;
- size_t array_size;
int num_regions;
int hwlock_id;
u32 version;
@@ -1071,8 +1070,8 @@ static int qcom_smem_probe(struct platform_device *pdev)
if (of_property_present(pdev->dev.of_node, "qcom,rpm-msg-ram"))
num_regions++;
- array_size = num_regions * sizeof(struct smem_region);
- smem = devm_kzalloc(&pdev->dev, sizeof(*smem) + array_size, GFP_KERNEL);
+ smem = devm_kzalloc(&pdev->dev, struct_size(smem, regions, num_regions),
+ GFP_KERNEL);
if (!smem)
return -ENOMEM;
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] soc: qcom: smem: Use struct_size()
2023-07-12 20:42 [PATCH] soc: qcom: smem: Use struct_size() Christophe JAILLET
@ 2023-07-12 22:40 ` Kees Cook
2023-07-14 5:33 ` Bjorn Andersson
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2023-07-12 22:40 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio, linux-kernel,
kernel-janitors, linux-arm-msm
On Wed, Jul 12, 2023 at 10:42:15PM +0200, Christophe JAILLET wrote:
> Use struct_size() instead of hand-writing it, when allocating a structure
> with a flex array.
>
> This is less verbose.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Kees Cook <keescook@chromium.org>
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] soc: qcom: smem: Use struct_size()
2023-07-12 20:42 [PATCH] soc: qcom: smem: Use struct_size() Christophe JAILLET
2023-07-12 22:40 ` Kees Cook
@ 2023-07-14 5:33 ` Bjorn Andersson
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Andersson @ 2023-07-14 5:33 UTC (permalink / raw)
To: keescook, Andy Gross, Konrad Dybcio, Christophe JAILLET
Cc: linux-kernel, kernel-janitors, linux-arm-msm
On Wed, 12 Jul 2023 22:42:15 +0200, Christophe JAILLET wrote:
> Use struct_size() instead of hand-writing it, when allocating a structure
> with a flex array.
>
> This is less verbose.
>
>
Applied, thanks!
[1/1] soc: qcom: smem: Use struct_size()
commit: cbdd13bfea785667f9c9df4c6ec46fc841ef6c4a
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-07-14 5:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-12 20:42 [PATCH] soc: qcom: smem: Use struct_size() Christophe JAILLET
2023-07-12 22:40 ` Kees Cook
2023-07-14 5:33 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox