net_sched: Use struct_size() and flex_array_size() helpers
Subsystems (3)
PATCH 1/1 net_sched: Use struct_size() and flex_array_size() helpers
Make use of the struct_size() and flex_array_size() helpers instead of an open-coded version, in order to avoid any potential type mistakes or integer overflows that, in the worse scenario, could lead to heap overflows.
--- net/sched/sch_api.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/sched/sch_api.c +4 -3
@@ -507,7 +507,8 @@ static struct qdisc_size_table *qdisc_get_stab(struct nlattr *opt,list_for_each_entry (stab, &qdisc_stab_list, list) {if (memcmp (&stab->szopts, s,sizeof (*s)))continue ; -if (tsize >0 &&memcmp (stab->data, tab, tsize *sizeof (u16))) +if (tsize >0 && +memcmp (stab->data, tab,flex_array_size (stab, data, tsize)))continue ; stab->refcnt++;return stab;
@@ -519,14 +520,14 @@ static struct qdisc_size_table *qdisc_get_stab(struct nlattr *opt,return ERR_PTR (-EINVAL ); } - stab =kmalloc (sizeof (*stab) + tsize *sizeof (u16),GFP_KERNEL ); + stab =kmalloc (struct_size (stab, data, tsize),GFP_KERNEL );if (!stab)return ERR_PTR (-ENOMEM ); stab->refcnt =1 ; stab->szopts = *s;if (tsize >0 ) -memcpy (stab->data, tab, tsize *sizeof (u16)); +memcpy (stab->data, tab,flex_array_size (stab, data, tsize));list_add_tail (&stab->list, &qdisc_stab_list);
Signature · 1 line
2.27.0
Jakub Kicinski
maintainerQuoted 7 lines · On Mon, 27 Sep 2021 17:18:49 -0500 Gustavo A. R. Silva wrote:
Make use of the
struct_size()andflex_array_size()helpers instead of an open-coded version, in order to avoid any potential type mistakes or integer overflows that, in the worse scenario, could lead to heap overflows.
Does not apply to net-next, please rebase & resend. Thanks!