From 2d35402ab3bcbae228a660f86fe6c2623436ce85 Mon Sep 17 00:00:00 2001
From: liuh-80 <liuh@microsoft.com>
Date: Thu, 7 Sep 2023 01:26:27 +0000
Subject: [PATCH] Fix swss-common binskim errors

---
 common/Makefile.am       | 6 +++---
 sonic-db-cli/Makefile.am | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/Makefile.am b/common/Makefile.am
index 19aaa2bc..c9dfc667 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -81,6 +81,6 @@ common_swssloglevel_SOURCES =  \
 	common/loglevel_util.cpp
 
 
-common_swssloglevel_CXXFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-common_swssloglevel_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CODE_COVERAGE_CPPFLAGS)
-common_swssloglevel_LDADD = common/libswsscommon.la $(CODE_COVERAGE_LIBS)
+common_swssloglevel_CXXFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS) -fstack-protector-strong
+common_swssloglevel_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CODE_COVERAGE_CPPFLAGS) -fstack-protector-strong
+common_swssloglevel_LDADD = common/libswsscommon.la $(CODE_COVERAGE_LIBS) -z now
diff --git a/sonic-db-cli/Makefile.am b/sonic-db-cli/Makefile.am
index a0c65ede..9b4a321f 100755
--- a/sonic-db-cli/Makefile.am
+++ b/sonic-db-cli/Makefile.am
@@ -6,6 +6,6 @@ sonic_db_cli_libsonicdbcli_la_LIBADD = common/libswsscommon.la -lpthread
 
 bin_PROGRAMS += sonic-db-cli/sonic-db-cli
 sonic_db_cli_sonic_db_cli_SOURCES = sonic-db-cli/sonic-db-cli.cpp sonic-db-cli/main.cpp
-sonic_db_cli_sonic_db_cli_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON)
-sonic_db_cli_sonic_db_cli_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
-sonic_db_cli_sonic_db_cli_LDADD = common/libswsscommon.la -lpthread
+sonic_db_cli_sonic_db_cli_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) -fstack-protector-strong
+sonic_db_cli_sonic_db_cli_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) -fstack-protector-strong
+sonic_db_cli_sonic_db_cli_LDADD = common/libswsscommon.la -lpthread -z now