Skip to content

Commit a13d386

Browse files
pmachatagregkh
authored andcommitted
net: nexthop: Initialize all fields in dumped nexthops
[ Upstream commit 6d745cd ] struct nexthop_grp contains two reserved fields that are not initialized by nla_put_nh_group(), and carry garbage. This can be observed e.g. with strace (edited for clarity): # ip nexthop add id 1 dev lo # ip nexthop add id 101 group 1 # strace -e recvmsg ip nexthop get id 101 ... recvmsg(... [{nla_len=12, nla_type=NHA_GROUP}, [{id=1, weight=0, resvd1=0x69, resvd2=0x67}]] ...) = 52 The fields are reserved and therefore not currently used. But as they are, they leak kernel memory, and the fact they are not just zero complicates repurposing of the fields for new ends. Initialize the full structure. Fixes: 430a049 ("nexthop: Add support for nexthop groups") Signed-off-by: Petr Machata <petrm@nvidia.com> Reviewed-by: Ido Schimmel <idosch@nvidia.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent fa938b0 commit a13d386

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

net/ipv4/nexthop.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -888,9 +888,10 @@ static int nla_put_nh_group(struct sk_buff *skb, struct nexthop *nh,
888888

889889
p = nla_data(nla);
890890
for (i = 0; i < nhg->num_nh; ++i) {
891-
p->id = nhg->nh_entries[i].nh->id;
892-
p->weight = nhg->nh_entries[i].weight - 1;
893-
p += 1;
891+
*p++ = (struct nexthop_grp) {
892+
.id = nhg->nh_entries[i].nh->id,
893+
.weight = nhg->nh_entries[i].weight - 1,
894+
};
894895
}
895896

896897
if (nhg->resilient && nla_put_nh_group_res(skb, nhg))

0 commit comments

Comments
 (0)