net: sched: cls_u32: use struct_size() helper
Subsystems (3)
PATCH 1/1 net: sched: cls_u32: use struct_size() helper
Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes, in particular in the context in which this code is being used.
So, replace code of the following form:
sizeof(*s) + s->nkeys*sizeof(struct tc_u32_key)
with:
struct_size(s, keys, s->nkeys)
This code was detected with the help of Coccinelle.
--- net/sched/cls_u32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/cls_u32.c +1 -1
@@ -847,7 +847,7 @@ static struct tc_u_knode *u32_init_knode(struct net *net, struct tcf_proto *tp,/* Similarly success statistics must be moved as pointers */ new->pcpu_success = n->pcpu_success;#endif -memcpy (&new->sel, s,sizeof (*s) + s->nkeys*sizeof (struct tc_u32_key )); +memcpy (&new->sel, s,struct_size (s, keys, s->nkeys));if (tcf_exts_init (&new->exts, net,TCA_U32_ACT ,TCA_U32_POLICE )) {kfree (new);
Signature · 1 line
2.21.0
From: "Gustavo A. R. Silva" <[email protected]>
Date: Wed, 1 May 2019 11:23:15 -0500
Quoted 8 lines
Make use of the
struct_size()helper instead of an open-coded version in order to avoid any potential type mistakes, in particular in the context in which this code is being used.So, replace code of the following form:
sizeof(*s)+ s->nkeys*sizeof(structtc_u32_key)
Quoted 7 lines
with:
struct_size(s, keys, s->nkeys)This code was detected with the help of Coccinelle.
Signed-off-by Gustavo A. R. Silva <[email protected]>
Applied.
Hi all,
Friendly ping:
Who can take this?
Thanks
--
Gustavo
Quoted 33 lines · 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, in particular in the context in which this code is being used.So, replace code of the following form:
sizeof(*s)+ s->nkeys*sizeof(structtc_u32_key)with:
struct_size(s, keys, s->nkeys)This code was detected with the help of Coccinelle.
Signed-off-by Gustavo A. R. Silva <[email protected]>--- net/sched/cls_u32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/sched/cls_u32.c +1
-1@@ -847,7 +847,7 @@ static struct tc_u_knode *u32_init_knode(struct net *net, struct tcf_proto *tp,/* Similarly success statistics must be moved as pointers */ new->pcpu_success = n->pcpu_success;#endif -memcpy (&new->sel, s,sizeof (*s) + s->nkeys*sizeof (struct tc_u32_key )); +memcpy (&new->sel, s,struct_size (s, keys, s->nkeys));if (tcf_exts_init (&new->exts, net,TCA_U32_ACT ,TCA_U32_POLICE )) {kfree (new);
Hi,
Sorry about the noise. I just noticed that Dave took this a while ago.
Thanks
--
Quoted 44 lines · Gustavo A. R. Silva
Hi all,
Friendly ping:
Who can take this?
Thanks
--
GustavoQuoted 33 lines · 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, in particular in the context in which this code is being used.So, replace code of the following form:
sizeof(*s)+ s->nkeys*sizeof(structtc_u32_key)with:
struct_size(s, keys, s->nkeys)This code was detected with the help of Coccinelle.
Signed-off-by Gustavo A. R. Silva <[email protected]>--- net/sched/cls_u32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/sched/cls_u32.c +1
-1@@ -847,7 +847,7 @@ static struct tc_u_knode *u32_init_knode(struct net *net, struct tcf_proto *tp,/* Similarly success statistics must be moved as pointers */ new->pcpu_success = n->pcpu_success;#endif -memcpy (&new->sel, s,sizeof (*s) + s->nkeys*sizeof (struct tc_u32_key )); +memcpy (&new->sel, s,struct_size (s, keys, s->nkeys));if (tcf_exts_init (&new->exts, net,TCA_U32_ACT ,TCA_U32_POLICE )) {kfree (new);