applying ASLR to tc-privacy-guard in privacy-guard-server package.

Change-Id: Iff0686f7d9b28226ef54b6b446042e2b7c88441f

diff --git a/pkgmgr_plugin/privileges.cpp b/pkgmgr_plugin/privileges.cpp
index 94938fb..eefcd13 100755 (executable)
--- a/pkgmgr_plugin/privileges.cpp
+++ b/pkgmgr_plugin/privileges.cpp
@@ -94,12 +94,17 @@ int PKGMGR_PARSER_PLUGIN_INSTALL(xmlDocPtr docPtr, const char* packageId)
        }
 
        char **ppPrivilegeList = (char**)calloc(privilegeList.size() + 1, sizeof(char*));
+       if (ppPrivilegeList == NULL) {
+               LOGE("Failed to allocate memory.");
+               return -ENOMEM;
+       }
+
        char **temp = ppPrivilegeList;
        std::list <std::string>::iterator iter = privilegeList.begin();
        for (size_t i = 0; i < privilegeList.size(); ++i) {
                ppPrivilegeList[i] = (char*)calloc(strlen(iter->c_str()) + 1, sizeof(char));
                if (ppPrivilegeList[i] == NULL) {
-                       LOGE("Failed allocate memory.");
+                       LOGE("Failed to allocate memory.");
                        destroy_char_list(ppPrivilegeList, privilegeList.size() + 1);
                        return -ENOMEM;
                }

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 457810a..f4d115d 100755 (executable)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -20,7 +20,8 @@ SET(EXTRA_CXXFLAGS "${EXTRA_CFLAGS} -fPIC -Wall -Werror")
 SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fPIC -Wall -fvisibility=hidden -D_WITH_SYSTEMD_")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} ${PACKAGE_NAME_CFLAGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} ${PACKAGE_NAME_CFLAGS} -fPIE")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
 ADD_EXECUTABLE(${TC1_NAME} ${TC1_SRCS})