[swss] Replace memset functions (#2423)

Signed-off-by: maipbui [email protected] What I did Replace memset() by memset_s() Why I did it memset() is an insecure function that can cause buffer overflow.
sonic-net · Sep 14, 2022 · 05c5c2f · 05c5c2f
1 parent 9ff993d
commit 05c5c2f
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 148 deletions.
diff --git a/fpmsyncd/fpmlink.cpp b/fpmsyncd/fpmlink.cpp
@@ -39,7 +39,7 @@ bool FpmLink::isRawProcessing(struct nlmsghdr *h)
     int len;
     short encap_type = 0;
     struct rtmsg *rtm;
-    struct rtattr *tb[RTA_MAX + 1];
+    struct rtattr *tb[RTA_MAX + 1] = {0};
 
     rtm = (struct rtmsg *)NLMSG_DATA(h);
 
@@ -54,7 +54,6 @@ bool FpmLink::isRawProcessing(struct nlmsghdr *h)
         return false;
     }
 
-    memset(tb, 0, sizeof(tb));
     netlink_parse_rtattr(tb, RTA_MAX, RTM_RTA(rtm), len);
 
     if (!tb[RTA_MULTIPATH])
@@ -120,7 +119,7 @@ FpmLink::FpmLink(RouteSync *rsync, unsigned short port) :
     m_server_up(false),
     m_routesync(rsync)
 {
-    struct sockaddr_in addr;
+    struct sockaddr_in addr = {};
     int true_val = 1;
 
     m_server_socket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
@@ -141,7 +140,6 @@ FpmLink::FpmLink(RouteSync *rsync, unsigned short port) :
         throw system_error(errno, system_category());
     }
 
-    memset (&addr, 0, sizeof (addr));
     addr.sin_family = AF_INET;
     addr.sin_port = htons(port);
     addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);

diff --git a/fpmsyncd/routesync.cpp b/fpmsyncd/routesync.cpp
@@ -347,7 +347,7 @@ bool RouteSync::getEvpnNextHop(struct nlmsghdr *h, int received_bytes,
 void RouteSync::onEvpnRouteMsg(struct nlmsghdr *h, int len)
 {
     struct rtmsg *rtm;
-    struct rtattr *tb[RTA_MAX + 1];
+    struct rtattr *tb[RTA_MAX + 1] = {0};
     void *dest = NULL;
     char anyaddr[16] = {0};
     char dstaddr[16] = {0};
@@ -360,7 +360,6 @@ void RouteSync::onEvpnRouteMsg(struct nlmsghdr *h, int len)
     rtm = (struct rtmsg *)NLMSG_DATA(h);
 
     /* Parse attributes and extract fields of interest. */
-    memset(tb, 0, sizeof(tb));
     netlink_parse_rtattr(tb, RTA_MAX, RTM_RTA(rtm), len);
 
     if (tb[RTA_DST])

diff --git a/mclagsyncd/mclaglink.cpp b/mclagsyncd/mclaglink.cpp
@@ -1744,7 +1744,7 @@ MclagLink::MclagLink(Select *select, int port) :
     m_server_up(false),
     m_select(select)
 {
-    struct sockaddr_in addr;
+    struct sockaddr_in addr = {};
     int true_val = 1;
 
     m_server_socket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
@@ -1765,7 +1765,6 @@ MclagLink::MclagLink(Select *select, int port) :
         throw system_error(errno, system_category());
     }
 
-    memset(&addr, 0, sizeof(addr));
     addr.sin_family = AF_INET;
     addr.sin_port = htons((unsigned short int)port);
     addr.sin_addr.s_addr = htonl(MCLAG_DEFAULT_IP);