iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv4: nexthop: Reduce allocation size of 'struct nh_group'

Browse Source 
The struct looks as follows:

struct nh_group {
	struct nh_group		*spare; /* spare group for removals */
	u16			num_nh;
	bool			mpath;
	bool			fdb_nh;
	bool			has_v4;
	struct nh_grp_entry	nh_entries[];
};

But its offset within 'struct nexthop' is also taken into account to
determine the allocation size.

Instead, use struct_size() to allocate only the required number of
bytes.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ido Schimmel
2020-08-26 19:48:51 +03:00
committed by David S. Miller
parent 751e42515e
commit d7d49dc77c
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/ipv4/nexthop.c
View File

@ -133,12 +133,9 @@ static struct nexthop *nexthop_alloc(void)
static struct nh_group *nexthop_grp_alloc(u16 num_nh) static struct nh_group *nexthop_grp_alloc(u16 num_nh)
{ {
size_t sz = offsetof(struct nexthop, nh_grp)
+ sizeof(struct nh_group)
+ sizeof(struct nh_grp_entry) * num_nh;
struct nh_group *nhg; struct nh_group *nhg;
nhg = kzalloc(sz, GFP_KERNEL); nhg = kzalloc(struct_size(nhg, nh_entries, num_nh), GFP_KERNEL);
if (nhg) if (nhg)
nhg->num_nh = num_nh; nhg->num_nh = num_nh;