Commit 1b32d34b authored by Petr Machata's avatar Petr Machata Committed by ZhangPeng
Browse files

net: nexthop: Initialize all fields in dumped nexthops 

stable inclusion
from stable-v6.6.44
commit 7704460acd7f5d35eb07c52500987dc9b95313fb
bugzilla: https://gitee.com/openeuler/kernel/issues/IAHMJO

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7704460acd7f5d35eb07c52500987dc9b95313fb



--------------------------------

[ Upstream commit 6d745cd0e9720282cd291d36b9db528aea18add2 ]

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: 430a0491 ("nexthop: Add support for nexthop groups")
Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent 81fe9248

net/ipv4/nexthop.c

+4 −3
Original line number Diff line number Diff line
@@ -676,9 +676,10 @@ static int nla_put_nh_group(struct sk_buff *skb, struct nh_group *nhg) 


	p = nla_data(nla);

	for (i = 0; i < nhg->num_nh; ++i) {

		p->id = nhg->nh_entries[i].nh->id;

		p->weight = nhg->nh_entries[i].weight - 1;

		p += 1;

		*p++ = (struct nexthop_grp) {

			.id = nhg->nh_entries[i].nh->id,

			.weight = nhg->nh_entries[i].weight - 1,

		};

	}



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