summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorIlya Maximets <i.maximets@ovn.org>2021-04-04 19:50:31 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-14 08:47:22 +0200
commite93c80d4bdc8f4b80317b88b13f6945788b2ff67 (patch)
treef0671abeae6866e9059acd3f6a0a80a82c449e98 /net
parentba0e8db170c301b73aa71eb4585218f3105cea0a (diff)
downloadlinux-e93c80d4bdc8f4b80317b88b13f6945788b2ff67.tar.gz
linux-e93c80d4bdc8f4b80317b88b13f6945788b2ff67.tar.bz2
linux-e93c80d4bdc8f4b80317b88b13f6945788b2ff67.zip
openvswitch: fix send of uninitialized stack memory in ct limit reply
[ Upstream commit 4d51419d49930be2701c2633ae271b350397c3ca ] 'struct ovs_zone_limit' has more members than initialized in ovs_ct_limit_get_default_limit(). The rest of the memory is a random kernel stack content that ends up being sent to userspace. Fix that by using designated initializer that will clear all non-specified fields. Fixes: 11efd5cb04a1 ("openvswitch: Support conntrack zone limit") Signed-off-by: Ilya Maximets <i.maximets@ovn.org> Acked-by: Tonghao Zhang <xiangxia.m.yue@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
-rw-r--r--net/openvswitch/conntrack.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 5eddfe7bd391..2316efd6ace8 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -2032,10 +2032,10 @@ static int ovs_ct_limit_del_zone_limit(struct nlattr *nla_zone_limit,
static int ovs_ct_limit_get_default_limit(struct ovs_ct_limit_info *info,
struct sk_buff *reply)
{
- struct ovs_zone_limit zone_limit;
-
- zone_limit.zone_id = OVS_ZONE_LIMIT_DEFAULT_ZONE;
- zone_limit.limit = info->default_limit;
+ struct ovs_zone_limit zone_limit = {
+ .zone_id = OVS_ZONE_LIMIT_DEFAULT_ZONE,
+ .limit = info->default_limit,
+ };
return nla_put_nohdr(reply, sizeof(zone_limit), &zone_limit);
}