From: Sarita Patra <saritap@vmware.com>
Date: Fri, 20 Nov 2020 08:01:19 +0000 (-0800)
Subject: pimd: Fix SA issues found in Coverity Scan
X-Git-Tag: base_7.6~222^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e1d1e95123f4a567a4db3408ef7db971e695b6f4;p=matthieu%2Ffrr.git

pimd: Fix SA issues found in Coverity Scan

Signed-off-by: Sarita Patra <saritap@vmware.com>
---

diff --git a/pimd/pim_nb_config.c b/pimd/pim_nb_config.c
index 9f7e5286fe..ba044de2f8 100644
--- a/pimd/pim_nb_config.c
+++ b/pimd/pim_nb_config.c
@@ -28,6 +28,8 @@
 #include "pim_ssm.h"
 #include "pim_ssmpingd.h"
 #include "pim_vxlan.h"
+#include "log.h"
+#include "lib_errors.h"
 
 static void pim_if_membership_clear(struct interface *ifp)
 {
@@ -2497,7 +2499,13 @@ int routing_control_plane_protocols_control_plane_protocol_pim_address_family_rp
 		else if (yang_dnode_get(args->dnode, "./prefix-list")) {
 			plist = yang_dnode_get_string(args->dnode,
 					"./prefix-list");
-			str2prefix("224.0.0.0/4", &group);
+			if (!str2prefix("224.0.0.0/4", &group)) {
+				flog_err(
+					EC_LIB_DEVELOPMENT,
+					"Unable to convert 224.0.0.0/4 to prefix");
+				return NB_ERR_INCONSISTENCY;
+			}
+
 			result = pim_no_rp_cmd_worker(pim, rp_addr.ip._v4_addr,
 					group, plist,
 					args->errmsg,
@@ -2592,7 +2600,11 @@ int routing_control_plane_protocols_control_plane_protocol_pim_address_family_rp
 		pim = vrf->info;
 		plist = yang_dnode_get_string(args->dnode, NULL);
 		yang_dnode_get_ip(&rp_addr, args->dnode, "../rp-address");
-		str2prefix("224.0.0.0/4", &group);
+		if (!str2prefix("224.0.0.0/4", &group)) {
+			flog_err(EC_LIB_DEVELOPMENT,
+				 "Unable to convert 224.0.0.0/4 to prefix");
+			return NB_ERR_INCONSISTENCY;
+		}
 		return pim_rp_cmd_worker(pim, rp_addr.ip._v4_addr, group,
 				plist, args->errmsg, args->errmsg_len);
 	}
@@ -2619,7 +2631,11 @@ int routing_control_plane_protocols_control_plane_protocol_pim_address_family_rp
 		pim = vrf->info;
 		yang_dnode_get_ip(&rp_addr, args->dnode, "../rp-address");
 		plist = yang_dnode_get_string(args->dnode, NULL);
-		str2prefix("224.0.0.0/4", &group);
+		if (!str2prefix("224.0.0.0/4", &group)) {
+			flog_err(EC_LIB_DEVELOPMENT,
+				 "Unable to convert 224.0.0.0/4 to prefix");
+			return NB_ERR_INCONSISTENCY;
+		}
 		return pim_no_rp_cmd_worker(pim, rp_addr.ip._v4_addr, group,
 				plist, args->errmsg,
 				args->errmsg_len);