diff mbox series

[ovs-dev,2/2] ofproto: Fix potential NULL dereference in ofproto_ct_*_zone_timeout_policy().

Message ID 20210525151622.7754.5796.stgit@dceara.remote.csb
State Accepted
Headers show
Series ofproto: Fix potential NULL dereference with invalid datapath types. | expand

Commit Message

Dumitru Ceara May 25, 2021, 3:16 p.m. UTC 
Spotted during code inspection.

Fixes: 993cae678bca ("ofproto-dpif: Consume CT_Zone, and CT_Timeout_Policy tables")
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
---
 ofproto/ofproto.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Paolo Valerio May 28, 2021, 2:35 p.m. UTC | #1 
Dumitru Ceara <dceara@redhat.com> writes:

> Spotted during code inspection.
>
> Fixes: 993cae678bca ("ofproto-dpif: Consume CT_Zone, and CT_Timeout_Policy tables")
> Signed-off-by: Dumitru Ceara <dceara@redhat.com>
> ---

Acked-by: Paolo Valerio <pvalerio@redhat.com>
diff mbox series

Patch

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index bf6a262be2..80ec2d9ac9 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);
     }