Merge "IPACM: Fix klocwork issue on master branch"
diff --git a/ipacm/src/IPACM_Iface.cpp b/ipacm/src/IPACM_Iface.cpp
index 3f7aa5a..52bf19d 100644
--- a/ipacm/src/IPACM_Iface.cpp
+++ b/ipacm/src/IPACM_Iface.cpp
@@ -871,7 +871,7 @@
memset(&ifr, 0, sizeof(struct ifreq));
(void)strncpy(ifr.ifr_name, if_name, sizeof(ifr.ifr_name));
- IPACMDBG_H("interface name (%s)\n", ifr.ifr_name);
+ IPACMDBG_H("interface name (%s)\n", if_name);
if (ioctl(fd,SIOCGIFINDEX , &ifr) < 0)
{
diff --git a/ipacm/src/IPACM_Netlink.cpp b/ipacm/src/IPACM_Netlink.cpp
index 34c1139..b5d7060 100644
--- a/ipacm/src/IPACM_Netlink.cpp
+++ b/ipacm/src/IPACM_Netlink.cpp
@@ -1502,6 +1502,12 @@
goto error;
}
+ if(msghdr== NULL)
+ {
+ IPACMERR(" failed to get msghdr\n");
+ goto error;
+ }
+
iov = msghdr->msg_iov;
memset(nlmsg, 0, sizeof(ipa_nl_msg_t));
@@ -1513,12 +1519,12 @@
/* Release NetLink message buffer */
if(msghdr)
{
- ipa_nl_release_msg(msghdr);
+ ipa_nl_release_msg(msghdr);
}
if(nlmsg)
{
- free(nlmsg);
- }
+ free(nlmsg);
+ }
}
return IPACM_SUCCESS;
diff --git a/ipacm/src/IPACM_Wan.cpp b/ipacm/src/IPACM_Wan.cpp
index 65dcca8..09af706 100644
--- a/ipacm/src/IPACM_Wan.cpp
+++ b/ipacm/src/IPACM_Wan.cpp
@@ -823,6 +823,11 @@
IPACMDBG_H("Setting up QMAP ID %d.\n", ext_prop->ext[0].mux_id);
}
}
+ else
+ {
+ IPACMERR("iface_query is empty.\n");
+ return IPACM_FAILURE;
+ }
}
for (cnt=0; cnt<tx_prop->num_tx_props; cnt++)
@@ -3433,7 +3438,7 @@
goto fail;
}
- if(num_ipv6_dest_flt_rule > 0)
+ if(num_ipv6_dest_flt_rule > 0 && num_ipv6_dest_flt_rule <= MAX_DEFAULT_v6_ROUTE_RULES)
{
if(m_filtering.DeleteFilteringHdls(ipv6_dest_flt_rule_hdl, IPA_IP_v6, num_ipv6_dest_flt_rule) == false)
{