From a4b04276ab5934d087669ff2d191a23931335c87 Mon Sep 17 00:00:00 2001 From: Dumitru Ceara Date: Tue, 25 May 2021 17:16:25 +0200 Subject: [PATCH] ofproto: Fix potential NULL dereference in ofproto_ct_*_zone_timeout_policy(). Spotted during code inspection. Fixes: 993cae678bca ("ofproto-dpif: Consume CT_Zone, and CT_Timeout_Policy tables") Signed-off-by: Dumitru Ceara Acked-by: Paolo Valerio Signed-off-by: Ilya Maximets --- ofproto/ofproto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index bf6a262be28..80ec2d9ac9c 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -981,7 +981,7 @@ ofproto_ct_set_zone_timeout_policy(const char *datapath_type, uint16_t zone_id, datapath_type = ofproto_normalize_type(datapath_type); const struct ofproto_class *class = ofproto_class_find__(datapath_type); - if (class->ct_set_zone_timeout_policy) { + if (class && class->ct_set_zone_timeout_policy) { class->ct_set_zone_timeout_policy(datapath_type, zone_id, timeout_policy); } @@ -993,7 +993,7 @@ ofproto_ct_del_zone_timeout_policy(const char *datapath_type, uint16_t zone_id) datapath_type = ofproto_normalize_type(datapath_type); const struct ofproto_class *class = ofproto_class_find__(datapath_type); - if (class->ct_del_zone_timeout_policy) { + if (class && class->ct_del_zone_timeout_policy) { class->ct_del_zone_timeout_policy(datapath_type, zone_id); }