Merge tag 'LA.UM.9.14.r1-21000-LAHAINA.QSSI13.0' into staging/lineage-20.0_merge-LA.UM.9.14.r1-21000-LAHAINA.QSSI13.0
"LA.UM.9.14.r1-21000-LAHAINA.QSSI13.0"
# By Raghavendar rao l (2) and Piyush dhyani (1)
# Via Gerrit - the friendly Code Review server (2) and others
* tag 'LA.UM.9.14.r1-21000-LAHAINA.QSSI13.0':
ipacm: Klock work issue
ipacm: Change to avoid out of bound access for array
ipacm: klock work issue
Change-Id: If03d96ea83688cfe6d31c205671e7c9ae4952513
diff --git a/ipacm/src/IPACM_LanToLan.cpp b/ipacm/src/IPACM_LanToLan.cpp
index 0075418..114c461 100644
--- a/ipacm/src/IPACM_LanToLan.cpp
+++ b/ipacm/src/IPACM_LanToLan.cpp
@@ -1772,10 +1772,10 @@
{
for(i = 0; i < IPA_HDR_L2_MAX; i++)
{
- IPACMDBG_H("Ref_cnt of peer l2 type %s is %d.\n", ipa_l2_hdr_type[i], ref_cnt_peer_l2_hdr_type[i]);
+ IPACMDBG_H("Ref_cnt of peer l2 type with index %d is %d.\n", i, ref_cnt_peer_l2_hdr_type[i]);
if(ref_cnt_peer_l2_hdr_type[i] > 0)
{
- IPACMDBG_H("Hdr proc ctx for peer l2 type %s: %d\n", ipa_l2_hdr_type[i], hdr_proc_ctx_for_inter_interface[i]);
+ IPACMDBG_H("Hdr proc ctx for peer l2 type %d: %d\n", i, hdr_proc_ctx_for_inter_interface[i]);
}
}
}
@@ -1805,8 +1805,8 @@
{
if(ref_cnt_peer_l2_hdr_type[j] > 0)
{
- IPACMDBG_H("Printing routing rule info for inter-interface communication for peer l2 type %s.\n",
- ipa_l2_hdr_type[j]);
+ IPACMDBG_H("Printing routing rule info for inter-interface communication for peer l2 type %d.\n",
+ j);
IPACMDBG_H("Number of IPv4 routing rules is %d, handles:\n", it_client->inter_iface_rt_rule_hdl[j].num_hdl[IPA_IP_v4]);
for(k = 0; k < it_client->inter_iface_rt_rule_hdl[j].num_hdl[IPA_IP_v4]; k++)
{
diff --git a/ipacm/src/IPACM_Main.cpp b/ipacm/src/IPACM_Main.cpp
index fedfba6..011bdb4 100644
--- a/ipacm/src/IPACM_Main.cpp
+++ b/ipacm/src/IPACM_Main.cpp
@@ -457,6 +457,7 @@
if (data_ex == NULL)
{
IPACMERR("unable to allocate memory for event data\n");
+ free(event_ex);
continue;
}
data_ex->num_of_attribs = event_ex->num_of_attribs;
@@ -474,6 +475,8 @@
if(new_neigh_data == NULL)
{
IPACMERR("Failed to allocate memory.\n");
+ free(data_ex);
+ free(event_ex);
continue;
}
memset(new_neigh_data, 0, sizeof(ipacm_event_data_all));