* [PATCH][next] net: dsa: sja1105: Use struct_size() in kzalloc()
@ 2020-06-19 18:10 Gustavo A. R. Silva
2020-06-19 19:38 ` Vladimir Oltean
2020-06-19 20:34 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2020-06-19 18:10 UTC (permalink / raw)
To: Vladimir Oltean, Andrew Lunn, Vivien Didelot, Florian Fainelli,
David S. Miller, Jakub Kicinski
Cc: linux-kernel, netdev, Gustavo A. R. Silva
Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes.
This code was detected with the help of Coccinelle and, audited and
fixed manually.
Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
drivers/net/dsa/sja1105/sja1105_tas.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/dsa/sja1105/sja1105_tas.c b/drivers/net/dsa/sja1105/sja1105_tas.c
index 3aa1a8b5f766..31d8acff1f01 100644
--- a/drivers/net/dsa/sja1105/sja1105_tas.c
+++ b/drivers/net/dsa/sja1105/sja1105_tas.c
@@ -475,8 +475,7 @@ bool sja1105_gating_check_conflicts(struct sja1105_private *priv, int port,
if (list_empty(&gating_cfg->entries))
return false;
- dummy = kzalloc(sizeof(struct tc_taprio_sched_entry) * num_entries +
- sizeof(struct tc_taprio_qopt_offload), GFP_KERNEL);
+ dummy = kzalloc(struct_size(dummy, entries, num_entries), GFP_KERNEL);
if (!dummy) {
NL_SET_ERR_MSG_MOD(extack, "Failed to allocate memory");
return true;
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH][next] net: dsa: sja1105: Use struct_size() in kzalloc()
2020-06-19 18:10 [PATCH][next] net: dsa: sja1105: Use struct_size() in kzalloc() Gustavo A. R. Silva
@ 2020-06-19 19:38 ` Vladimir Oltean
2020-06-19 20:34 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Vladimir Oltean @ 2020-06-19 19:38 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Andrew Lunn, Vivien Didelot, Florian Fainelli, David S. Miller,
Jakub Kicinski, lkml, netdev, Gustavo A. R. Silva
Hi Gustavo,
On Fri, 19 Jun 2020 at 21:04, Gustavo A. R. Silva <gustavoars@kernel.org> wrote:
>
> Make use of the struct_size() helper instead of an open-coded version
> in order to avoid any potential type mistakes.
>
> This code was detected with the help of Coccinelle and, audited and
> fixed manually.
>
> Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
> ---
> drivers/net/dsa/sja1105/sja1105_tas.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/dsa/sja1105/sja1105_tas.c b/drivers/net/dsa/sja1105/sja1105_tas.c
> index 3aa1a8b5f766..31d8acff1f01 100644
> --- a/drivers/net/dsa/sja1105/sja1105_tas.c
> +++ b/drivers/net/dsa/sja1105/sja1105_tas.c
> @@ -475,8 +475,7 @@ bool sja1105_gating_check_conflicts(struct sja1105_private *priv, int port,
> if (list_empty(&gating_cfg->entries))
> return false;
>
> - dummy = kzalloc(sizeof(struct tc_taprio_sched_entry) * num_entries +
> - sizeof(struct tc_taprio_qopt_offload), GFP_KERNEL);
> + dummy = kzalloc(struct_size(dummy, entries, num_entries), GFP_KERNEL);
Before, I could read this line and I knew what it did. Now, I have to
look it up.
But if it's in the interest of kernel coding style, what can I say.
Acked-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> if (!dummy) {
> NL_SET_ERR_MSG_MOD(extack, "Failed to allocate memory");
> return true;
> --
> 2.27.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH][next] net: dsa: sja1105: Use struct_size() in kzalloc()
2020-06-19 18:10 [PATCH][next] net: dsa: sja1105: Use struct_size() in kzalloc() Gustavo A. R. Silva
2020-06-19 19:38 ` Vladimir Oltean
@ 2020-06-19 20:34 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2020-06-19 20:34 UTC (permalink / raw)
To: gustavoars
Cc: olteanv, andrew, vivien.didelot, f.fainelli, kuba, linux-kernel,
netdev, gustavo
From: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Date: Fri, 19 Jun 2020 13:10:07 -0500
> Make use of the struct_size() helper instead of an open-coded version
> in order to avoid any potential type mistakes.
>
> This code was detected with the help of Coccinelle and, audited and
> fixed manually.
>
> Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-19 20:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-19 18:10 [PATCH][next] net: dsa: sja1105: Use struct_size() in kzalloc() Gustavo A. R. Silva
2020-06-19 19:38 ` Vladimir Oltean
2020-06-19 20:34 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).