Merge branch 'OP-TEE:master' into multipath

Author: chaohub

Makefile

@@ -137,13 +137,13 @@ distclean: clean
 copy_export: build
 	mkdir -p $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR)
 	cp config.mk $(DESTDIR)/$(INCLUDEDIR)/optee_client_config.mk
-	cp -a ${O}/libteec/libteec.so* $(DESTDIR)$(LIBDIR)
-	cp -a ${O}/libteec/libteec.a $(DESTDIR)$(LIBDIR)
+	cp -d ${O}/libteec/libteec.so* $(DESTDIR)$(LIBDIR)
+	cp -d ${O}/libteec/libteec.a $(DESTDIR)$(LIBDIR)
 	cp ${O}/tee-supplicant/tee-supplicant $(DESTDIR)$(SBINDIR)
 	cp public/*.h $(DESTDIR)$(INCLUDEDIR)
 	cp libckteec/include/*.h $(DESTDIR)$(INCLUDEDIR)
-	cp -a ${O}/libckteec/libckteec.so* $(DESTDIR)$(LIBDIR)
-	cp -a ${O}/libckteec/libckteec.a $(DESTDIR)$(LIBDIR)
+	cp -d ${O}/libckteec/libckteec.so* $(DESTDIR)$(LIBDIR)
+	cp -d ${O}/libckteec/libckteec.a $(DESTDIR)$(LIBDIR)
 	cp libseteec/include/*.h $(DESTDIR)$(INCLUDEDIR)
-	cp -a ${O}/libseteec/libseteec.so* $(DESTDIR)$(LIBDIR)
-	cp -a ${O}/libseteec/libseteec.a $(DESTDIR)$(LIBDIR)
+	cp -d ${O}/libseteec/libseteec.so* $(DESTDIR)$(LIBDIR)
+	cp -d ${O}/libseteec/libseteec.a $(DESTDIR)$(LIBDIR)

tee-supplicant/src/tee_supplicant.c

@@ -101,7 +101,9 @@ static struct tee_shm *shm_head;
 
 struct tee_supplicant_params supplicant_params = {
 	.ta_dir = "optee_armtz",
+#ifdef TEE_PLUGIN_LOAD_PATH
 	.plugin_load_path = TEE_PLUGIN_LOAD_PATH,
+#endif
 	.fs_parent_path  = TEE_FS_PARENT_PATH,
 };
 
@@ -418,19 +420,18 @@ static uint32_t process_free(size_t num_params, struct tee_ioctl_param *params)
 	if (!shm)
 		return TEEC_ERROR_BAD_PARAMETERS;
 
+	close(shm->fd);
 	if (shm->registered) {
 		free(shm->p);
 	} else  {
 		if (munmap(shm->p, shm->size) != 0) {
 			EMSG("munmap(%p, %zu) failed - Error = %s",
 			     shm->p, shm->size, strerror(errno));
-			close(shm->fd);
 			free(shm);
 			return TEEC_ERROR_BAD_PARAMETERS;
 		}
 	}
 
-	close(shm->fd);
 	free(shm);
 	return TEEC_SUCCESS;
 }