Merge pull request #35 from arakshit011/sfsconfig-enablement

Enablement of SFS-config and update persist partition path

Author: harshaldev27

CMakeLists.txt

@@ -26,6 +26,7 @@ include(GNUInstallDirs)
 set(MINKIDLC_BIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/idlc" CACHE PATH "Directory containing the idlc executable")
 set(SYSTEMD_UNIT_DIR "" CACHE PATH "Directory containing the systemd unit path")
 set(UDEV_DIR "" CACHE PATH "Directory containing the UDEV path")
+set(MINKIPC_LIBEXEC_DIR "" CACHE PATH "Directory containing the libexec script/binaries path")
 
 if ("${MINKIDLC_BIN_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}/idlc")
 	file(DOWNLOAD

listeners/libfsservice/cmn/cmn.h

@@ -32,8 +32,8 @@
 #define LEGACY_DATA_PATH        "/data/misc/qsee/"
 #define LEGACY_PERSIST_PATH     "/persist/data/"
 #define DATA_PATH               "/var/tmp/qtee_supplicant/vendor/tzstorage/"
-#define PERSIST_PATH            "/var/persist/qtee_supplicant/"
-#define PERSIST_MOUNT_PATH      "/var/persist"
+#define PERSIST_PATH            "/var/lib/tee/qtee_supplicant/"
+#define PERSIST_MOUNT_PATH      "/var/lib/tee"
 
 /* Secure File System - version 2 */
 #define GP_FS_VERSION           2

listeners/libfsservice/cmn/helper.c

@@ -29,6 +29,7 @@ static char *gp_whitelist_paths[] = {
 
 bool is_persist_partition_mounted(void)
 {
+	bool ret = false;
 	FILE *f;
 	struct mntent *entry;
 
@@ -39,14 +40,16 @@ bool is_persist_partition_mounted(void)
 
 	while ((entry = getmntent(f))) {
 		if (strcmp(entry->mnt_dir, PERSIST_MOUNT_PATH) == 0) {
-			return true;
+			ret = true;
+			goto exit;
 		}
 	}
-	endmntent(f);
+	MSGE("Persist partition not mounted!\n");
 
 exit:
-	MSGE("Persist partition not mounted!\n");
-	return false;
+	if (f)
+		endmntent(f);
+	return ret;
 }
 
 int check_dir_path(const char *path)

qtee_supplicant/CMakeLists.txt

@@ -46,11 +46,17 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}")
+if (DEFINED MINKIPC_LIBEXEC_DIR AND NOT "${MINKIPC_LIBEXEC_DIR}" STREQUAL "")
+	configure_file(sfs_config.in sfs_config @ONLY)
+	install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/sfs_config" DESTINATION "${MINKIPC_LIBEXEC_DIR}")
+endif()
 if (DEFINED SYSTEMD_UNIT_DIR AND NOT "${SYSTEMD_UNIT_DIR}" STREQUAL "")
 	configure_file(qteesupplicant.service.in qteesupplicant.service @ONLY)
 	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qteesupplicant.service" DESTINATION "${SYSTEMD_UNIT_DIR}")
+	configure_file(sfsconfig.service.in sfsconfig.service @ONLY)
+	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sfsconfig.service" DESTINATION "${SYSTEMD_UNIT_DIR}")
 endif()
-if (DEFINED SYSTEMD_UNIT_DIR AND NOT "${UDEV_DIR}" STREQUAL "")
+if (DEFINED UDEV_DIR AND NOT "${UDEV_DIR}" STREQUAL "")
 	configure_file(qcomtee-udev.rules.in 99-qcomtee-udev.rules @ONLY)
 	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/99-qcomtee-udev.rules" DESTINATION ${UDEV_DIR})
 endif()

qtee_supplicant/qteesupplicant.service.in

@@ -3,7 +3,7 @@
 [Unit]
 Description=QTEE Supplicant Service
 BindsTo=dev-tee0.device
-After=dev-tee0.device
+After=dev-tee0.device sfsconfig.service
 
 [Service]
 Type=exec

qtee_supplicant/sfs_config.in

@@ -0,0 +1,28 @@
+#!/bin/sh
+#==============================================================================
+# FILE: sfs_config
+#
+# DESCRIPTION:
+# create files and give permissions to the files and directories needed by
+# secure file system
+#
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+#==============================================================================
+set -e
+
+if [ -e /var/lib/tee ]; then
+    if [ ! -d /var/lib/tee/qtee_supplicant ]; then
+         echo "Creating /var/lib/tee/qtee_supplicant"
+         mkdir -p /var/lib/tee/qtee_supplicant
+    fi
+    chmod o+rwx /var/lib/tee/qtee_supplicant
+fi
+
+if [ ! -d /var/tmp/qtee_supplicant/vendor/tzstorage ]; then
+    echo "Creating /var/tmp/qtee_supplicant/vendor/tzstorage"
+    mkdir -p /var/tmp/qtee_supplicant/vendor/tzstorage
+fi
+chmod o+rwx /var/tmp/qtee_supplicant/vendor/tzstorage
+
+exit 0

qtee_supplicant/sfsconfig.service.in

@@ -0,0 +1,14 @@
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+[Unit]
+Description=SFS Configuration Service
+SourcePath=@MINKIPC_LIBEXEC_DIR@/sfs_config
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=@MINKIPC_LIBEXEC_DIR@/sfs_config
+
+[Install]
+WantedBy=multi-user.target
+